Changeset 6046 for code/branches/sound3/src/orxonox/sound/SoundManager.h

Timestamp:

Nov 11, 2009, 5:55:26 PM (15 years ago)

Author:

youngk

Message:

Made a big change to the sound system: Implemented cross-fading for multiple changing sources.
Compiles, however the game doesn't load sounds properly in the main menu and on entering a level.
It can load a sound via DistanceTrigger and fades in/out correctly, but second loading fails.

Please test.

File:

• code/branches/sound3/src/orxonox/sound/SoundManager.h (modified) (2 diffs)

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

@@ -42 +42 @@
      *
      */
-    class _OrxonoxExport SoundManager : public Singleton<SoundManager>
+    class _OrxonoxExport SoundManager : public Singleton<SoundManager>, public OrxonoxClass
     {
         friend class Singleton<SoundManager>;
@@ -49 +49 @@
         ~SoundManager();
 
+        void update(const Clock &time);
+        void setConfigValues(void);
+
         void setListenerPosition(const Vector3& position);
         void setListenerOrientation(const Quaternion& orientation);
-        void registerAmbientSound(BaseSound* newAmbient);
-        void unregisterAmbientSound(BaseSound* currentAmbient);
+
+        void registerAmbientSound(AmbientSound* newAmbient);
+        void unregisterAmbientSound(AmbientSound* currentAmbient);
         const std::string& getAmbientPath(const std::string& source);
+        void fadeInAmbientSound(float dt);
+        void fadeOutAmbientSound(float dt);
+        void checkFadeStepValidity(void);
 
     private:
         ALCdevice* device_;
         ALCcontext* context_;
-        std::list<BaseSound*> ambientSounds_;
-        std::string lastReqPath;
+       
+        std::list<AmbientSound*> ambientSounds_;
+        
+        float fadeStep_;       //per second
+        std::list<std::pair<AmbientSound*, float> > fadeInList_;
+        std::list<std::pair<AmbientSound*, float> > fadeOutList_;
+        
+        std::string lastReqPath_;
 
         static SoundManager* singletonPtr_s;