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

Timestamp:

Dec 11, 2009, 2:15:43 PM (15 years ago)

Author:

rgrieder

Message:

Added audio source management. This should reduce the problems when loading too many sounds.
However if there are too many players shooting at the same time, some sounds may still not play.

File:

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

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

@@ -43 +43 @@
 {
     BaseSound::BaseSound()
-        : audioSource_(0)
-        , bPooling_(false)
+        : bPooling_(false)
         , volume_(1.0)
         , bLooping_(false)
@@ -52 +51 @@
         RegisterRootObject(BaseSound);
 
-        if (GameMode::playsSound())
-        {
-            alGenSources(1, &this->audioSource_);
-            if (!alIsSource(this->audioSource_))
-                COUT(1) << "Sound: Source generation failed: " << SoundManager::getALErrorString(alGetError()) << std::endl;
-
-            if (alIsSource(this->audioSource_))
-            {
-                alSourcei(this->audioSource_, AL_REFERENCE_DISTANCE, 20);
-                alSourcei(this->audioSource_, AL_MAX_DISTANCE, 10000);
-            }
-        }
+        // Initialise audioSource_ to a value that is not a source
+        // 0 is unfortunately not guaranteed to be no source ID.
+        this->audioSource_ = 123456789;
+        while (alIsSource(++this->audioSource_));
     }
 
     BaseSound::~BaseSound()
     {
-        this->setSource(std::string());
-        if (GameMode::playsSound() && alIsSource(this->audioSource_))
-            alDeleteSources(1, &this->audioSource_);
+        this->stop();
     }
 
@@ -84 +73 @@
     {
         this->state_ = Playing;
-        if (GameMode::playsSound() && alIsSource(this->audioSource_) && this->getSourceState() != AL_PLAYING)
-        {
+        if (GameMode::playsSound() && this->getSourceState() != AL_PLAYING && this->soundBuffer_ != NULL)
+        {
+            if (!alIsSource(this->audioSource_))
+                this->audioSource_ = SoundManager::getInstance().getSoundSource();
+            if (!alIsSource(this->audioSource_))
+                return;
+            this->initialiseSource();
+
             alSourcePlay(this->audioSource_);
-
             if (int error = alGetError())
-                COUT(2) << "Sound: Error playing sound: " << error << std::endl;
+                COUT(2) << "Sound: Error playing sound: " << SoundManager::getALErrorString(error) << std::endl;
         }
     }
@@ -96 +90 @@
     {
         this->state_ = Stopped;
-        if (GameMode::playsSound() && alIsSource(this->audioSource_))
+        if (alIsSource(this->audioSource_))
+        {
             alSourceStop(this->audioSource_);
+            // Release buffer
+            alSourcei(this->audioSource_, AL_BUFFER, AL_NONE);
+            // Release source again
+            SoundManager::getInstance().releaseSoundSource(this->audioSource_);
+            // Get a no source ID
+            this->audioSource_ += 123455;
+            while (alIsSource(++this->audioSource_));
+        }
     }
 
@@ -105 +108 @@
             return;
         this->state_ = Paused;
-        if (GameMode::playsSound() && alIsSource(this->audioSource_))
+        if (alIsSource(this->audioSource_))
             alSourcePause(this->audioSource_);
     }
@@ -111 +114 @@
     ALint BaseSound::getSourceState() const
     {
-        if (GameMode::playsSound() && alIsSource(this->audioSource_))
+        if (alIsSource(this->audioSource_))
         {
             ALint state;
@@ -121 +124 @@
     }
 
+    void BaseSound::initialiseSource()
+    {
+        this->updateVolume();
+        this->setPitch(this->getPitch());
+        this->setLooping(this->getLooping());
+        alSource3f(this->audioSource_, AL_POSITION,  0, 0, 0);
+        alSource3f(this->audioSource_, AL_VELOCITY,  0, 0, 0);
+        alSource3f(this->audioSource_, AL_DIRECTION, 0, 0, 0);
+        alSourcei(this->audioSource_, AL_REFERENCE_DISTANCE, 20);
+        alSourcei(this->audioSource_, AL_MAX_DISTANCE, 10000);
+        if (ALint error = alGetError())
+            COUT(2) << "Sound Warning: Setting source parameters to 0 failed: "
+                    << SoundManager::getALErrorString(error) << std::endl;
+        assert(this->soundBuffer_ != NULL);
+        alSourcei(this->audioSource_, AL_BUFFER, this->soundBuffer_->getBuffer());
+        if (ALuint error = alGetError())
+            COUT(1) << "Sound Error: Could not set buffer \"" << this->source_ << "\": " << SoundManager::getALErrorString(error) << std::endl;
+    }
+
     void BaseSound::setVolume(float vol)
     {
@@ -136 +158 @@
     float BaseSound::getVolumeGain()
     {
+        assert(GameMode::playsSound());
         return SoundManager::getInstance().getVolume(SoundType::none);
     }
@@ -143 +166 @@
         if (alIsSource(this->audioSource_))
         {
-            alSourcef(this->audioSource_, AL_GAIN, this->volume_*this->getVolumeGain());
+            float volume = this->volume_ * this->getVolumeGain();
+            alSourcef(this->audioSource_, AL_GAIN, volume);
             if (int error = alGetError())
-                COUT(2) << "Sound: Error setting volume: " << error << std::endl;
+                COUT(2) << "Sound: Error setting volume to " << volume
+                        << ": " << SoundManager::getALErrorString(error) << std::endl;
         }
     }
@@ -152 +177 @@
     {
         this->bLooping_ = val;
-        if (GameMode::playsSound() && alIsSource(this->audioSource_))
+        if (alIsSource(this->audioSource_))
             alSourcei(this->audioSource_, AL_LOOPING, (val ? AL_TRUE : AL_FALSE));
     }
@@ -165 +190 @@
         }        
         this->pitch_ = pitch;
-        if (GameMode::playsSound() && alIsSource(this->audioSource_))
+        if (alIsSource(this->audioSource_))
         {
             if (int error = alGetError())
-                COUT(2) << "Sound: Error setting pitch: " << error << std::endl;
+                COUT(2) << "Sound: Error setting pitch: " << SoundManager::getALErrorString(error) << std::endl;
             alSourcef(this->audioSource_, AL_PITCH, pitch);
         }
@@ -183 +208 @@
         if (this->soundBuffer_ != NULL)
         {
+            // Stopping is imperative here!
             if (alIsSource(this->audioSource_))
             {
                 alSourceStop(this->audioSource_);
-                // Unload old buffer first
-                alSourcei(this->audioSource_, AL_BUFFER, 0);
+                alSourcei(this->audioSource_, AL_BUFFER, AL_NONE);
             }
             SoundManager::getInstance().releaseSoundBuffer(this->soundBuffer_, this->bPooling_);
@@ -194 +219 @@
 
         this->source_ = source;
-        if (source_.empty() || !alIsSource(this->audioSource_))
+        if (source_.empty())
             return;
 
@@ -201 +226 @@
             return;
 
-        alSourcei(this->audioSource_, AL_BUFFER, this->soundBuffer_->getBuffer());
-        if (ALuint error = alGetError())
-        {
-            COUT(1) << "Sound Error: Could not load file \"" << source << "\": " << SoundManager::getALErrorString(error) << std::endl;
-            return;
-        }
-
-        alSource3f(this->audioSource_, AL_POSITION,  0, 0, 0);
-        this->updateVolume();
-        this->setPitch(this->getPitch());
-        this->setLooping(getLooping());
-        if (this->isPlaying() || this->isPaused())
-        {
-            alSourcePlay(this->audioSource_);
-            if (int error = alGetError())
-                COUT(2) << "Sound: Error playing sound: " << error << std::endl;
-        }
-        if (this->isPaused())
-            alSourcePause(this->audioSource_);
+        if (alIsSource(this->audioSource_))
+        {
+            alSourcei(this->audioSource_, AL_BUFFER, this->soundBuffer_->getBuffer());
+            if (ALuint error = alGetError())
+            {
+                COUT(1) << "Sound Error: Could not set buffer \"" << source << "\": " << SoundManager::getALErrorString(error) << std::endl;
+                return;
+            }
+
+            if (this->isPlaying() || this->isPaused())
+            {
+                alSourcePlay(this->audioSource_);
+                if (int error = alGetError())
+                    COUT(2) << "Sound: Error playing sound: " << SoundManager::getALErrorString(error) << std::endl;
+            }
+            if (this->isPaused())
+                alSourcePause(this->audioSource_);
+        }
     }