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

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.h (modified) (3 diffs)

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_;