Changeset 7288 in orxonox.OLD for trunk

Timestamp:

Apr 13, 2006, 11:20:51 PM (19 years ago)

Author:

bensch

Message:

thread works, but…. hmm… it is not what i want… no sound :/

Location:

trunk/src

Files:

• lib/sound/sound_source.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (4 diffs)

trunk/src/lib/sound/sound_source.cc

@@ -68 +68 @@
   if (unlikely(this->sourceID == 0))
     SoundEngine::getInstance()->popALSource(this->sourceID);
-  assert (this->sourceID != 0);
+//  assert (this->sourceID != 0);
 
   alSourceStop(this->sourceID);

trunk/src/story_entities/game_world.cc

@@ -140 +140 @@
   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->music != NULL)
-      gw->dataTank->music->playback();
+    if(gw->dataTank && gw->dataTank->music != NULL)
+      gw->dataTank->music->update();
     SDL_Delay(5);
   }
@@ -234 +237 @@
   this->bRunning = false;
 
-//  SDL_KillThread(this->audioThread);
+  //  SDL_KillThread(this->audioThread);
   this->audioThread = NULL;
 }
@@ -396 +399 @@
   PNode::getNullParent()->updateNode (this->dtS);
   SoundEngine::getInstance()->update();
-
-  if (this->dataTank->music != NULL)
-    this->dataTank->music->update();
 }
 
@@ -412 +412 @@
       this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
-  this->dataTank->objectManager->getObjectList(OM_GROUP_01));
+      this->dataTank->objectManager->getObjectList(OM_GROUP_01));
 
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),