Changeset 10557 for code/branches/core7/src/orxonox/sound

Timestamp:

Aug 29, 2015, 6:18:30 PM (9 years ago)

Author:

landauf

Message:

cleanup: no need to pass/return WeakPtrs to/from functions. normal pointers are enough.

Location:

code/branches/core7/src/orxonox/sound

Files:

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

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

@@ -419 +419 @@
     }
 
-    void SoundManager::fadeIn(const StrongPtr<AmbientSound>& sound)
+    void SoundManager::fadeIn(AmbientSound* sound)
     {
         // If we're already fading out --> remove that
@@ -435 +435 @@
     }
 
-    void SoundManager::fadeOut(const StrongPtr<AmbientSound>& sound)
+    void SoundManager::fadeOut(AmbientSound* sound)
     {
         // If we're already fading in --> remove that

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

@@ -106 +106 @@
     private:
         void processCrossFading(float dt);
-        void fadeIn(const StrongPtr<AmbientSound>& sound);
-        void fadeOut(const StrongPtr<AmbientSound>& sound);
+        void fadeIn(AmbientSound* sound);
+        void fadeOut(AmbientSound* sound);
 
         void checkFadeStepValidity();