Changeset 7292 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Apr 14, 2006, 11:18:42 AM (19 years ago)

Author:

bensch

Message:

better debug, (non-threaded again)

File:

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

trunk/src/story_entities/game_world.cc

@@ -136 +136 @@
 int GameWorld::createAudioThread(void* gameWorld)
 {
-  GameWorld* gw = (GameWorld*)gameWorld;
+/*  GameWorld* gw = (GameWorld*)gameWorld;
   printf("STARTIG AUDIO THREAD\n");
   if(gw->dataTank && gw->dataTank->music != NULL)
@@ -146 +146 @@
       gw->dataTank->music->update();
     SDL_Delay(1);
-  }
+  }*/
   printf("End the AudioThread\n");
 }
@@ -230 +230 @@
     this->audioThread = SDL_CreateThread(GameWorld::createAudioThread, (void*)this);
 
+  if (this->dataTank->music != NULL)
+    this->dataTank->music->playback();
+
   this->run();
 }
@@ -241 +244 @@
   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;
@@ -403 +413 @@
   PNode::getNullParent()->updateNode (this->dtS);
   SoundEngine::getInstance()->update();
+
+  if (this->dataTank->music != NULL)
+    this->dataTank->music->update();
+
 }