Changeset 7283 in orxonox.OLD for trunk/src/story_entities/game_world.cc

Timestamp:

Apr 13, 2006, 7:15:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: thread for audio, and 'is' to 'b'

File:

• trunk/src/story_entities/game_world.cc (modified) (10 diffs)

trunk/src/story_entities/game_world.cc

@@ -89 +89 @@
 
   this->dataXML = NULL;
+
+  this->audioThread = NULL;
 }
 
@@ -100 +102 @@
 {
   PRINTF(4)("Deleted GameWorld\n");
+
+  if (this->audioThread != NULL)
+    SDL_KillThread(this->audioThread);
 }
 
@@ -131 +136 @@
 }
 
+int GameWorld::createAudioThread(void* gameWorld)
+{
+  GameWorld* gw = (GameWorld*)gameWorld;
+  printf("STARTIG AUDIO THREAD\n");
+  while (gw->bRunning)
+  {
+    if(gw->dataTank->music != NULL)
+      gw->dataTank->music->playback();
+    SDL_Delay(5);
+  }
+  printf("End the AudioThread\n");
+}
 
 /**
@@ -199 +216 @@
 bool GameWorld::start()
 {
-  this->isPaused = false;
-  this->isRunning = true;
+  this->bPaused = false;
+  this->bRunning = true;
+
+  if (this->audioThread == NULL)
+    this->audioThread = SDL_CreateThread(GameWorld::createAudioThread, (void*)this);
 
   this->run();
@@ -212 +232 @@
 {
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
-  this->isRunning = false;
+  this->bRunning = false;
+
+//  SDL_KillThread(this->audioThread);
+  this->audioThread = NULL;
 }
 
@@ -221 +244 @@
 bool GameWorld::pause()
 {
-  this->isPaused = true;
+  this->bPaused = true;
 }
 
@@ -230 +253 @@
 bool GameWorld::resume()
 {
-  this->isPaused = false;
+  this->bPaused = false;
 }
 
@@ -243 +266 @@
 void GameWorld::run()
 {
-  /* start the music */
-  if(this->dataTank->music != NULL)
-    this->dataTank->music->playback();
-
   PRINTF(3)("GameWorld::mainLoop() - Entering main loop\n");
 
@@ -256 +275 @@
   this->lastFrame = SDL_GetTicks ();
 
-  while( this->isRunning) /* @todo implement pause */
+  while( this->bRunning) /* @todo implement pause */
   {
     /* process intput */
     this->handleInput ();
-    if( !this->isRunning)
+    if( !this->bRunning)
       break;
 
@@ -326 +345 @@
   Uint32 currentFrame = SDL_GetTicks();
 
-  if( !this->isPaused)
+  if( !this->bPaused)
   {
     // CALCULATE FRAMERATE