Changeset 6349 for code/branches/presentation2/src/orxonox/sound/SoundManager.cc

Timestamp:

Dec 14, 2009, 12:51:34 AM (14 years ago)

Author:

rgrieder

Message:

Overriding preDestroy() in AmbientSound to make them fade out when the level unloads.
@Kevin: this should also prevent the random bug you showed me when reloading a level with ambient sound.

File:

• code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) (5 diffs)

code/branches/presentation2/src/orxonox/sound/SoundManager.cc

@@ -314 +314 @@
     {
         if (oldAmbient == NULL || ambientSounds_.empty())
-        {
             return;
-        }
+
         if (this->ambientSounds_.front().first == oldAmbient) 
         {
@@ -468 +467 @@
     
 
-    void SoundManager::fadeIn(AmbientSound* sound)
+    void SoundManager::fadeIn(const SmartPtr<AmbientSound>& sound)
     {
         // If we're already fading out --> remove that
-        for (std::list<AmbientSound*>::iterator it = this->fadeOutList_.begin(); it != this->fadeOutList_.end(); it++)
+        for (std::list<SmartPtr<AmbientSound> >::iterator it = this->fadeOutList_.begin(); it != this->fadeOutList_.end(); it++)
         {
             if (*it == sound)
@@ -484 +483 @@
     }
 
-    void SoundManager::fadeOut(AmbientSound* sound)
+    void SoundManager::fadeOut(const SmartPtr<AmbientSound>& sound)
     {
         // If we're already fading in --> remove that
-        for (std::list<AmbientSound*>::iterator it = this->fadeInList_.begin(); it != this->fadeInList_.end(); it++)
+        for (std::list<SmartPtr<AmbientSound> >::iterator it = this->fadeInList_.begin(); it != this->fadeInList_.end(); it++)
         {
             if (*it == sound)
@@ -510 +509 @@
         
         // FADE IN
-        for (std::list<AmbientSound*>::iterator it= this->fadeInList_.begin(); it != this->fadeInList_.end(); )
+        for (std::list<SmartPtr<AmbientSound> >::iterator it= this->fadeInList_.begin(); it != this->fadeInList_.end(); )
         {
             if ((*it)->getVolume() + this->crossFadeStep_*dt > 1.0f)
@@ -525 +524 @@
 
         // FADE OUT
-        for (std::list<AmbientSound*>::iterator it = this->fadeOutList_.begin(); it != this->fadeOutList_.end(); )
+        for (std::list<SmartPtr<AmbientSound> >::iterator it = this->fadeOutList_.begin(); it != this->fadeOutList_.end(); )
         {
             if ((*it)->getVolume() - this->crossFadeStep_*dt < 0.0f)