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

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

File:

• trunk/src/lib/sound/ogg_player.cc (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);
+}
 
 /**