Changeset 6186 for code/branches/presentation2/src/orxonox/sound/BaseSound.cc

Timestamp:

Nov 30, 2009, 11:50:17 PM (14 years ago)

Author:

dafrick

Message:

Some cleanup in SoundManager and related classes. Overrall volume works now. Mute function has been implemented into the gui.
Once again you'll have to delete your orxonox.ini file to be trouble free.

File:

• code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) (4 diffs)

code/branches/presentation2/src/orxonox/sound/BaseSound.cc

@@ -38 +38 @@
 #include "core/Resource.h"
 #include "core/XMLPort.h"
+#include "SoundManager.h"
 
 namespace orxonox
@@ -54 +55 @@
             assert(this->audioSource_ != 0);
         }
+        
     }
 
@@ -108 +110 @@
         }
         this->volume_ = vol;
+        
+        this->updateVolume();
+    }
+    
+    float BaseSound::getVolumeGain()
+    {
+        return SoundManager::getInstance().getVolume(SoundType::none);
+    }
+    
+    void BaseSound::updateVolume(void)
+    {
         if (alIsSource(this->audioSource_))
-            alSourcef(this->audioSource_, AL_GAIN, this->getEffectiveVolume());
-    }
-    
-    void BaseSound::setVolumeGain(float gain)
-    {
-        COUT(1) << "blubb: " << gain << std::endl;
-        if (gain > 1 || gain < 0)
-        {
-            COUT(2) << "Sound warning: volume gain out of range, cropping value." << std::endl;
-            gain = gain > 1 ? 1 : gain;
-            gain = gain < 0 ? 0 : gain;
-        }
-        this->volumeGain_ = gain;
-        if (alIsSource(this->audioSource_))
-            alSourcef(this->audioSource_, AL_GAIN, this->getEffectiveVolume());
-    }
-    
-    float BaseSound::getEffectiveVolume(void)
-    {
-        return this->volume_*this->volumeGain_;
+            alSourcef(this->audioSource_, AL_GAIN, this->volume_*this->getVolumeGain());
     }
 
@@ -200 +194 @@
 
         alSource3f(this->audioSource_, AL_POSITION,  0, 0, 0);
-        alSourcef (this->audioSource_, AL_GAIN, this->getEffectiveVolume());
+        this->updateVolume();
         alSourcei (this->audioSource_, AL_LOOPING, (this->bLoop_ ? AL_TRUE : AL_FALSE));
         if (this->isPlaying() || this->isPaused())