Changeset 6411

Timestamp:

Dec 24, 2009, 4:01:23 PM (14 years ago)

Author:

rgrieder

Message:

BaseSound should release the buffer upon destruction and the SoundManager should delete all remaining buffers and sources.

Location:

code/branches/presentation2/src/orxonox/sound

Files:

• BaseSound.cc (modified) (1 diff)
• SoundManager.cc (modified) (1 diff)

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

@@ -60 +60 @@
     {
         this->stop();
+        // Release buffer
+        if (this->soundBuffer_ != NULL)
+        {
+            assert(GameMode::playsSound());
+            SoundManager::getInstance().releaseSoundBuffer(this->soundBuffer_, this->bPooling_);
+        }
     }
 

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

@@ -162 +162 @@
     SoundManager::~SoundManager()
     {
+        // Erase fade lists because of the smart pointers
+        this->fadeInList_.clear();
+        this->fadeOutList_.clear();
+
+        // If there are still used buffers around, well, that's just very bad...
+        if (this->soundBuffers_.size() != this->effectsPool_.size())
+            COUT(1) << "Sound Error: Some sound buffers are still in use but OpenAL is about to shut down. Fix this!" << std::endl;
+        // Empty buffer pool and buffer list
+        this->effectsPool_.clear();
+        this->soundBuffers_.clear();
+
+        // There should not be any sources in use anymore
+        if (!this->usedSoundSources_.empty())
+            COUT(1) << "Sound Error: Some sound sources are still in use but OpenAL is about to shut down. Fix this!" << std::endl;
+        while (!this->availableSoundSources_.empty())
+        {
+            alDeleteSources(1, &this->availableSoundSources_.back());
+            this->availableSoundSources_.pop_back();
+        }
+
         GameMode::setPlaysSound(false);