Changeset 10555 for code/branches/core7/src/orxonox/sound/SoundManager.h

Timestamp:

Aug 29, 2015, 5:35:59 PM (9 years ago)

Author:

landauf

Message:

renamed SmartPtr to StrongPtr (now we have weak and strong pointers)

File:

• code/branches/core7/src/orxonox/sound/SoundManager.h (modified) (3 diffs)

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

@@ -40 +40 @@
 #include "util/Singleton.h"
 #include "core/config/Configurable.h"
-#include "core/object/SmartPtr.h"
+#include "core/object/StrongPtr.h"
 #include "core/UpdateListener.h"
 
@@ -106 +106 @@
     private:
         void processCrossFading(float dt);
-        void fadeIn(const SmartPtr<AmbientSound>& sound);
-        void fadeOut(const SmartPtr<AmbientSound>& sound);
+        void fadeIn(const StrongPtr<AmbientSound>& sound);
+        void fadeOut(const StrongPtr<AmbientSound>& sound);
 
         void checkFadeStepValidity();
@@ -129 +129 @@
         //! Absolute change per second (0.1 means 10% of the nominal volume) for cross fading
         float                              crossFadeStep_;
-        std::list<SmartPtr<AmbientSound> > fadeInList_;
-        std::list<SmartPtr<AmbientSound> > fadeOutList_;
+        std::list<StrongPtr<AmbientSound> > fadeInList_;
+        std::list<StrongPtr<AmbientSound> > fadeOutList_;
 
         // Volume related