Changeset 7291 in orxonox.OLD for trunk

Timestamp:

Apr 14, 2006, 10:28:24 AM (19 years ago)

Author:

bensch

Message:

trunk: fixed a soundSource bug. The SoundSource did not release its alSource on Stop.

Location:

trunk/src

Files:

• lib/sound/sound_engine.cc (modified) (4 diffs)
• lib/sound/sound_source.cc (modified) (3 diffs)
• story_entities/game_world.cc (modified) (2 diffs)

trunk/src/lib/sound/sound_engine.cc

@@ -75 +75 @@
   while(!this->ALSources.empty())
   {
-    alDeleteSources(1, &this->ALSources.top());
-    SoundEngine::checkError("Deleting Source", __LINE__);
+    if (alIsSource(this->ALSources.top()))
+    {
+      alDeleteSources(1, &this->ALSources.top());
+      SoundEngine::checkError("Deleting Source", __LINE__);
+    }
+    else
+      PRINTF(1)("%d is not a Source\n", this->ALSources.top());
+
     this->ALSources.pop();
   }
@@ -169 +175 @@
     ALfloat orientation [6] = {1,0,0, absDirV.x, absDirV.y, absDirV.z};
     alListenerfv(AL_ORIENTATION, orientation);
+    SoundEngine::checkError("SoundEngine::update() - Listener Error", __LINE__);
   }
   else
@@ -185 +192 @@
         int play = 0x000;
         alGetSourcei(source->getID(), AL_SOURCE_STATE, &play);
+        if (DEBUG > 2)
+          SoundEngine::checkError("SoundEngine::update() Play", __LINE__);
         if(play == AL_PLAYING)
         {
@@ -193 +202 @@
                        source->getNode()->getAbsCoor().y,
                        source->getNode()->getAbsCoor().z);
+            if (DEBUG > 2)
+              SoundEngine::checkError("SoundEngine::update() Set Source Position", __LINE__);
             alSource3f(source->getID(), AL_VELOCITY,
                        source->getNode()->getVelocity().x,
                        source->getNode()->getVelocity().y,
                        source->getNode()->getVelocity().z);
+            if (DEBUG > 2)
+              SoundEngine::checkError("SoundEngine::update() Set Source Velocity", __LINE__);
           }
         }

trunk/src/lib/sound/sound_source.cc

@@ -46 +46 @@
 SoundSource::~SoundSource()
 {
-  SoundEngine::getInstance()->pushALSource(this->sourceID);
+  this->stop();
 }
 
@@ -69 +69 @@
 {
   if (unlikely(this->sourceID == 0))
+  {
     SoundEngine::getInstance()->popALSource(this->sourceID);
+    if (sourceID == 0)
+    {
+      PRINTF(2)("No more Free source\n");
+      return;
+    }
+  }
 //  assert (this->sourceID != 0);
 
@@ -90 +97 @@
 {
   this->bPlay = false;
-  alSourceStop(this->sourceID);
-  SoundEngine::getInstance()->pushALSource(this->sourceID);
+  if (this->sourceID != 0)
+  {
+    alSourceStop(this->sourceID);
+    if (DEBUG >= 3)
+      SoundEngine::checkError("StopSource", __LINE__);
+    SoundEngine::getInstance()->pushALSource(this->sourceID);
+    this->sourceID = 0;
+  }
 }
 

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");
 }