Changeset 6046 for code/branches/sound3/src/orxonox/sound/AmbientSound.cc

Timestamp:

Nov 11, 2009, 5:55:26 PM (14 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/AmbientSound.cc (modified) (3 diffs)

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

@@ -65 +65 @@
     {
         COUT(3) << this->getSource() << ": Playing" << std::endl;
-        SoundManager::getInstance().registerAmbientSound(this);
-        SUPER(AmbientSound, play);
+        if(GameMode::playsSound())
+        {
+            SoundManager::getInstance().registerAmbientSound(this);
+            this->BaseSound::play();
+        }
     }
 
     void AmbientSound::replay()
     {
-        SUPER(AmbientSound, play);
+        this->BaseSound::play();
     }
 
     void AmbientSound::stop()
     {
-        SUPER(AmbientSound, stop);
-        SoundManager::getInstance().unregisterAmbientSound(this);
+        if(GameMode::playsSound())
+        {
+            SoundManager::getInstance().unregisterAmbientSound(this);
+        }
     }
 
-    void AmbientSound::pause()
+    void AmbientSound::doStop()
     {
-        SUPER(AmbientSound, pause);
+        this->BaseSound::stop();
     }
 
     void AmbientSound::setSource(const std::string& source)
     {
-        if(source.find('/') == std::string.npos)
+        if(source.find('/') == std::string.npos && GameMode::playsSound())
         {
             std::string filePath = SoundManager::getInstance().getAmbientPath(source);
             if(!(filePath.empty()))
             {
-                BaseSound::setSource(filePath);
+                this->BaseSound::setSource(filePath);
                 return;
             }
@@ -102 +107 @@
     {
         COUT(3) << this->getSource() << ": ChangedActivity: " << this->isActive() << std::endl;
-        SUPER(AmbientSound, changedActivity);
+        this->BaseObject::changedActivity();
         if(this->isActive())
         {
@@ -112 +117 @@
         }
     }
-
 }