Changeset 6349

Timestamp:

Dec 14, 2009, 12:51:34 AM (15 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.

Location:

code/branches/presentation2/src/orxonox

Files:

• gamestates/GSMainMenu.cc (modified) (1 diff)
• sound/AmbientSound.cc (modified) (1 diff)
• sound/AmbientSound.h (modified) (1 diff)
• sound/SoundManager.cc (modified) (5 diffs)
• sound/SoundManager.h (modified) (3 diffs)

code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc

@@ -73 +73 @@
     {
         if (GameMode::playsSound())
-            delete this->ambient_;
+            this->ambient_->destroy();
 
         InputManager::getInstance().destroyState("mainMenu");

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

@@ -53 +53 @@
     AmbientSound::~AmbientSound()
     {
+    }
+
+    void AmbientSound::preDestroy()
+    {
+        if (GameMode::playsSound())
+        {
+            // Smoothly fade out by keeping a SmartPtr
+            SoundManager::getInstance().unregisterAmbientSound(this);
+        }
     }
     

code/branches/presentation2/src/orxonox/sound/AmbientSound.h

@@ -67 +67 @@
 
     private:
+        virtual void preDestroy();
         void doPlay();
         void doStop();

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)

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

@@ -40 +40 @@
 #include "util/Singleton.h"
 #include "core/OrxonoxClass.h"
+#include "core/SmartPtr.h"
 
 // forward declaration
@@ -109 +110 @@
     private:
         void processCrossFading(float dt);
-        void fadeIn(AmbientSound* sound);
-        void fadeOut(AmbientSound* sound);
+        void fadeIn(const SmartPtr<AmbientSound>& sound);
+        void fadeOut(const SmartPtr<AmbientSound>& sound);
 
         void checkFadeStepValidity();
@@ -133 +134 @@
 
         float crossFadeStep_;       //!< Absolute change per second (0.1 means 10% of the nominal volume) for cross fading
-        std::list<AmbientSound*> fadeInList_;
-        std::list<AmbientSound*> fadeOutList_;
+        std::list<SmartPtr<AmbientSound> > fadeInList_;
+        std::list<SmartPtr<AmbientSound> > fadeOutList_;
 
         float soundVolume_;