Changeset 9869 in orxonox.OLD for trunk/src/lib/sound/ogg_player.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/sound/ogg_player.cc (modified) (3 diffs)

trunk/src/lib/sound/ogg_player.cc

@@ -34 +34 @@
 
 #include "helper_functions.h"
-
-#ifdef HAVE_SDL_SDL_H
-
-#include <SDL/SDL.h>
-#include <SDL/SDL_endian.h>
-
-#else
-
-#include <SDL.h>
-#include <SDL_endian.h>
-
-#endif
+#include "sdlincl.h"
 
 namespace OrxSound
 {
+  ObjectListDefinition(OggPlayer);
   /**
    * initializes an Ogg-player from a file
@@ -55 +45 @@
   OggPlayer::OggPlayer(const std::string& fileName)
   {
-    this->setClassID(CL_SOUND_OGG_PLAYER, "OggPlayer");
+    this->registerObject(this, OggPlayer::_objectList);
 
     this->state = OggPlayer::None;
@@ -276 +266 @@
         ogg->update();
       }
-      SDL_Delay(10);
+      SDL_Delay(1);
     }
     PRINTF(4)("End the AudioThread\n");