Changeset 7304 in orxonox.OLD for trunk/src/lib/sound

Timestamp:

Apr 16, 2006, 8:27:32 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved the AudioThread completely to the OggPlayer. This cleans out the unnecesary overFULLNESS from game_world

Location:

trunk/src/lib/sound

Files:

• ogg_player.cc (modified) (3 diffs)
• ogg_player.h (modified) (5 diffs)

trunk/src/lib/sound/ogg_player.cc

@@ -40 +40 @@
   this->buffers[0] = 0;
   this->buffers[1] = 0;
+  this->musicThread = NULL;
 
   if (!fileName.empty())
@@ -135 +136 @@
   return true;
 }
+
+
+
+int OggPlayer::createAudioThread(void* oggPlayer)
+{
+  if (oggPlayer == NULL)
+    return -1;
+  OggPlayer* ogg = (OggPlayer*)oggPlayer;
+  PRINTF(4)("STARTIG AUDIO THREAD\n");
+
+  ogg->playback();
+
+  while (ogg->state & Playing)
+  {
+    ogg->update();
+    SDL_Delay(1);
+  }
+  PRINTF(4)("End the AudioThread\n");
+}
+
 
 /**
@@ -171 +192 @@
     this->state &= ! FileOpened;
   }
-}
-
+
+  // Kill the Music Thread.
+  if (this->musicThread != NULL)
+  {
+    assert (!(this->state & Playing));
+    SDL_WaitThread(this->musicThread, NULL);
+    this->musicThread = NULL;
+  }
+}
+
+
+bool OggPlayer::play()
+{
+  if (this->musicThread == NULL)
+    this->musicThread = SDL_CreateThread(OggPlayer::createAudioThread, (void*)this);
+}
 
 /**

trunk/src/lib/sound/ogg_player.h

@@ -15 +15 @@
 #include <ogg/ogg.h>
 #include <vorbis/vorbisfile.h>
+#include <SDL_thread.h>
 
 struct File;
@@ -31 +32 @@
   bool open(const std::string& fileName);
   void release();
-  void debug();
-  bool playback();
+  bool play();
   bool playing();
   bool update();
@@ -38 +38 @@
   void jumpTo(float timeCode);
 
+  void debug();
   void printState();
+
+  static int createAudioThread(void* oggPlayer);
+
 
 protected:
@@ -45 +49 @@
   const char* errorString(int code);
 
-  public:
-    typedef enum {
-      None                   = 0x000,
-      FileOpened             = 0x100,
-      SourceAllocated        = 0x200,
-      BuffersAllocated       = 0x400,
-      Stopped                = 0x010,
-      Playing                = 0x020,
-      Paused                 = 0x040,
-      Error                  = 0x001,
-    } State;
+private:
+  bool playback();
+
+
+public:
+  typedef enum {
+    None                   = 0x000,
+    FileOpened             = 0x100,
+    SourceAllocated        = 0x200,
+    BuffersAllocated       = 0x400,
+    Stopped                = 0x010,
+    Playing                = 0x020,
+    Paused                 = 0x040,
+    Error                  = 0x001,
+  } State;
 
 private:
@@ -67 +75 @@
   ALenum              format;               //!< The format we play back
   unsigned int        state;
-  //bool                trackLoaded;          //!< If a Track has been loaded.
+
+  SDL_Thread*         musicThread;          //!< The Thread in which music is Played back.
 };