Changeset 7308 in orxonox.OLD

Timestamp:

Apr 16, 2006, 11:08:25 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: added a mutex, that should prevent the SoundEngine from failing, when jumping around in the file

Location:

trunk/src

Files:

• lib/sound/ogg_player.cc (modified) (20 diffs)
• lib/sound/ogg_player.h (modified) (3 diffs)
• story_entities/game_world.cc (modified) (2 diffs)

trunk/src/lib/sound/ogg_player.cc

@@ -35 +35 @@
   this->setClassID(CL_SOUND_OGG_PLAYER, "OggPlayer");
 
-  this->state = None;
+  this->state = OggPlayer::None;
 
   this->source = 0;
   this->buffers[0] = 0;
   this->buffers[1] = 0;
-  this->musicThread = NULL;
+  this->musicThreadID = NULL;
+  this->musicMutex = SDL_CreateMutex();
 
   if (!fileName.empty())
@@ -47 +48 @@
       this->setName(fileName);
   }
+
 }
 
@@ -55 +57 @@
 {
   this->release();
+  SDL_DestroyMutex(this->musicMutex);
 }
 
@@ -67 +70 @@
 {
   // release old Ogg-File (if loaded)
-  if (this->state & FileOpened)
+  if (this->state & OggPlayer::FileOpened)
     this->release();
 
@@ -75 +78 @@
   SoundEngine::checkError("Allocating Buffers", __LINE__);
   if (this->buffers[0] != 0 && this->buffers[1] != 0)
-    state |= BuffersAllocated;
+    state |= OggPlayer::BuffersAllocated;
   else
   {
@@ -86 +89 @@
     SoundEngine::getInstance()->popALSource(this->source);
   if (this->source != 0)
-    state |= SourceAllocated;
+    state |= OggPlayer::SourceAllocated;
   else
   {
@@ -110 +113 @@
     return false;
   }
-  this->state |= FileOpened;
+  this->state |= OggPlayer::FileOpened;
 
   // acquiring the vorbis-properties.
@@ -142 +145 @@
 bool OggPlayer::play()
 {
-  if (!(this->state & FileOpened))
+  if (!(this->state & OggPlayer::FileOpened))
     return false;
 
@@ -150 +153 @@
     return false;
 
-  if (this->musicThread == NULL)
-    return ((this->musicThread = SDL_CreateThread(OggPlayer::createAudioThread, (void*)this)) != NULL);
+  if (this->musicThreadID == NULL)
+    return ((this->musicThreadID = SDL_CreateThread(OggPlayer::musicThread, (void*)this)) != NULL);
   return true;
 }
@@ -189 +192 @@
 void OggPlayer::jumpTo(float timeCode)
 {
+
   if (this->state & OggPlayer::FileOpened)
+  {
+    SDL_mutexP(this->musicMutex);
     ov_time_seek(&this->oggStream, timeCode);
+    SDL_mutexV(this->musicMutex);
+  }
 }
 
@@ -210 +218 @@
 bool OggPlayer::isPlaying()
 {
-  if (!(this->state & FileOpened))
+  if (!(this->state & OggPlayer::FileOpened))
     return false;
   ALenum state;
@@ -229 +237 @@
  * @returns -1 on error.
  */
-int OggPlayer::createAudioThread(void* oggPlayer)
+int OggPlayer::musicThread(void* oggPlayer)
 {
   if (oggPlayer == NULL)
     return -1;
   OggPlayer* ogg = (OggPlayer*)oggPlayer;
+
   PRINTF(4)("STARTIG AUDIO THREAD\n");
-
   while (ogg->state & OggPlayer::Playing)
   {
+    SDL_mutexP(ogg->musicMutex);
     ogg->update();
+    SDL_mutexV(ogg->musicMutex);
     SDL_Delay(1);
   }
@@ -264 +274 @@
   if (DEBUG >= 3)
     SoundEngine::checkError("OggPlayer::playback()::alSourceQueueBuffers", __LINE__);
-  if (!alIsBuffer(this->buffers[0])) printf("AHA0\n");
-  if (!alIsBuffer(this->buffers[1])) printf("AHA1\n");
-
-  if (!alIsSource(this->source)) printf("AHA2\n");
-  SoundEngine::checkError("SKJFLKSDJF",__LINE__);
+
 
   alSourcePlay(this->source);
@@ -282 +288 @@
 void OggPlayer::suspend()
 {
-  if (this->musicThread != NULL)
+  if (this->musicThreadID != NULL)
   {
     assert (!(this->state & Playing));
     this->printState();
-    SDL_WaitThread(this->musicThread, NULL);
-    this->musicThread = NULL;
+    SDL_WaitThread(this->musicThreadID, NULL);
+    this->musicThreadID = NULL;
   }
   if (this->state & OggPlayer::SourceAllocated)
@@ -302 +308 @@
 bool OggPlayer::update()
 {
-  if (unlikely(!(this->state & Playing)))
-    return false;
-
-  int processed;
+  int processed = 0;
   bool active = true;
 
@@ -372 +375 @@
 void OggPlayer::release()
 {
-  if (this->state & SourceAllocated)
+  if (this->state & OggPlayer::SourceAllocated)
   {
     assert(alIsSource(this->source));
@@ -379 +382 @@
       this->state &= ~OggPlayer::Playing;
       // Kill the Music Thread.
-      if (this->musicThread != NULL)
+      if (this->musicThreadID != NULL)
         this->suspend();
 
@@ -390 +393 @@
     this->state &= ~SourceAllocated;
   }
-  if (this->state & BuffersAllocated)
+  if (this->state & OggPlayer::BuffersAllocated)
   {
     assert (this->buffers[0] != 0 && this->buffers[1] != 0);
@@ -397 +400 @@
     this->buffers[0] = 0;
     this->buffers[1] = 0;
-    this->state &= ~BuffersAllocated;
-  }
-
-  if (this->state & FileOpened)
+    this->state &= ~OggPlayer::BuffersAllocated;
+  }
+
+  if (this->state & OggPlayer::FileOpened)
   {
     ov_clear(&oggStream);
-    this->state &= ~FileOpened;
+    this->state &= ~OggPlayer::FileOpened;
   }
 
@@ -457 +460 @@
 {
   PRINTF(0)("OggPlayer is in the following States: ");
-  if (this->state & FileOpened)
+  if (this->state & OggPlayer::FileOpened)
     PRINT(0)("FileOpened ");
-  if (this->state & SourceAllocated)
+  if (this->state & OggPlayer::SourceAllocated)
     PRINT(0)("SourceAllocated ");
-  if (this->state & BuffersAllocated)
+  if (this->state & OggPlayer::BuffersAllocated)
     PRINT(0)("BuffersAllocated ");
-  if (this->state & Stopped)
+  if (this->state & OggPlayer::Stopped)
     PRINT(0)("Stopped ");
-  if (this->state & Playing)
+  if (this->state & OggPlayer::Playing)
     PRINT(0)("Playing ");
-  if (this->state & Paused)
+  if (this->state & OggPlayer::Paused)
     PRINT(0)("Paused ");
-  if (this->state & Error)
+  if (this->state & OggPlayer::Error)
     PRINT(0)("Error ");
   PRINT(0)("\n");

trunk/src/lib/sound/ogg_player.h

@@ -20 +20 @@
 
 
-#define OGG_PLAYER_BUFFER_SIZE (8096 * 4)
+#define OGG_PLAYER_BUFFER_SIZE (8096 * 2)
 
 
@@ -66 +66 @@
 
 private:
-  static int createAudioThread(void* oggPlayer);
+  static int musicThread(void* oggPlayer);
   bool playback();
   void suspend();
@@ -87 +87 @@
   unsigned int        state;                //!< The States the OggPlayer is in (this can be multiple entries from OggPlayer::State).
 
-  SDL_Thread*         musicThread;          //!< The Thread in which music is Played back.
+  SDL_Thread*         musicThreadID;        //!< The Thread in which music is Played back.
+  SDL_mutex*          musicMutex;           //!< A Mutex so that the two threads do not interfere.
 };
 

trunk/src/story_entities/game_world.cc

@@ -274 +274 @@
     this->display ();
 
+    /// TODO REMOVE THIS CRAP
     if (this->dataTank->music)
     {
-      if (this->cycle%100 == 0)
+/*      if (this->cycle%100 == 0)
       {
         printf("Cycle %d  ", this->cycle);
         this->dataTank->music->printState();
       }
+      if (this->cycle %10)
+        this->dataTank->music->jumpTo((float)this->cycle*(float)rand()/(float)RAND_MAX);
       if (this->cycle % 4 == 0)
         this->dataTank->music->pause();
@@ -286 +289 @@
         this->dataTank->music->play();
       if (this->cycle % 11 == 0)
-        this->dataTank->music->stop();
+      this->dataTank->music->stop(); */
     }
   }