Changeset 7304 in orxonox.OLD for trunk

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

Files:

• lib/sound/ogg_player.cc (modified) (3 diffs)
• lib/sound/ogg_player.h (modified) (5 diffs)
• story_entities/game_world.cc (modified) (6 diffs)
• story_entities/game_world.h (modified) (3 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.
 };
 

trunk/src/story_entities/game_world.cc

@@ -89 +89 @@
 
   this->dataXML = NULL;
-
-  this->audioThread = NULL;
 }
 
@@ -134 +132 @@
 }
 
-int GameWorld::createAudioThread(void* gameWorld)
-{
-  GameWorld* gw = (GameWorld*)gameWorld;
-  printf("STARTIG AUDIO THREAD\n");
-  if(gw->dataTank && gw->dataTank->music != NULL)
-    gw->dataTank->music->playback();
-
-  while (gw->bRunning)
-  {
-    if(gw->dataTank && gw->dataTank->music != NULL)
-      gw->dataTank->music->update();
-    SDL_Delay(1);
-  }
-  printf("End the AudioThread\n");
-}
 
 /**
@@ -204 +187 @@
   PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
 
-  if (this->audioThread != NULL)
-  {
-    this->bRunning = false;
-    SDL_WaitThread(this->audioThread, NULL);
-    this->audioThread = NULL;
-  }
-
   this->dataTank->unloadData();
 
@@ -227 +203 @@
   this->bRunning = true;
 
-  if (this->audioThread == NULL)
-    this->audioThread = SDL_CreateThread(GameWorld::createAudioThread, (void*)this);
-
   this->run();
 }
@@ -241 +214 @@
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
   this->bRunning = false;
-
-  if (this->audioThread != NULL)
-  {
-    this->bRunning = false;
-    SDL_WaitThread(this->audioThread, NULL);
-    this->audioThread = NULL;
-  }
-
-  this->audioThread = NULL;
 }
 
@@ -288 +252 @@
   this->dtS = 0.0f;
   this->lastFrame = SDL_GetTicks ();
+
+  if (this->dataTank->music != NULL)
+    this->dataTank->music->play();
 
   while( this->bRunning) /* @todo implement pause */

trunk/src/story_entities/game_world.h

@@ -10 +10 @@
 #include "story_entity.h"
 #include "game_world_data.h"
-
-#include <SDL_thread.h>
 
 class Shell;
@@ -56 +54 @@
     static void toggleBVVisibility();
 
-    static int createAudioThread(void* GameWorld);
-
-
     inline void setSky(WorldEntity* sky) { this->dataTank->sky = sky; }
 
@@ -80 +75 @@
 
   protected:
-    SDL_Thread*         audioThread;
     GameWorldData*      dataTank;                     //!< reference to the GameWorld Data Tank
     TiXmlElement*       dataXML;                      //!< The XML-Element this World has been loaded with.