Changeset 7856 for code/trunk/src/orxonox

Timestamp:

Feb 11, 2011, 4:05:55 PM (14 years ago)

Author:

landauf

Message:

fixed an endless loop in SoundManager::preUpdate if a non-looping ambient sound faded out. maybe solved the problem by returning a bool from stop() depending on whether or not the sound source was destroyed.

someone who knows more about the sound system should probably have a look at this.

Location:

code/trunk/src/orxonox/sound

Files:

• AmbientSound.cc (modified) (1 diff)
• AmbientSound.h (modified) (1 diff)
• BaseSound.cc (modified) (2 diffs)
• BaseSound.h (modified) (2 diffs)
• SoundManager.cc (modified) (1 diff)

code/trunk/src/orxonox/sound/AmbientSound.cc

@@ -57 +57 @@
     }
 
-    void AmbientSound::stop()
+    bool AmbientSound::stop()
     {
         if (GameMode::playsSound())
             SoundManager::getInstance().unregisterAmbientSound(this);
+        return false; // sound source not (yet) destroyed - return false
     }
 

code/trunk/src/orxonox/sound/AmbientSound.h

@@ -51 +51 @@
 
         void play();
-        void stop();
+        bool stop();
         void pause();
 

code/trunk/src/orxonox/sound/BaseSound.cc

@@ -96 +96 @@
     }
 
-    void BaseSound::doStop()
+    bool BaseSound::doStop()
     {
         this->state_ = Stopped;
@@ -109 +109 @@
             this->audioSource_ += 123455;
             while (alIsSource(++this->audioSource_));
-        }
+            
+            return true; // sound source destroyed - return true
+        }
+        return false; // nothing done - return false
     }
 

code/trunk/src/orxonox/sound/BaseSound.h

@@ -51 +51 @@
 
         virtual void play()  { this->doPlay(); }
-        virtual void stop()  { this->doStop(); }
+        virtual bool stop()  { return this->doStop(); } // returns true if the sound source was destroyed
         virtual void pause() { this->doPause(); }
 
@@ -86 +86 @@
 
         void doPlay();
-        void doStop();
+        bool doStop(); // returns true if the sound source was destroyed
         void doPause();
 

code/trunk/src/orxonox/sound/SoundManager.cc

@@ -241 +241 @@
             if (state == AL_STOPPED)
             {
-                this->usedSoundSources_[i].second->stop();
-                --i;
+                if (this->usedSoundSources_[i].second->stop()) // if stop() returns true, the sound source was removed, thus decrement the array index
+                    --i;
             }
         }