Changeset 4219 in orxonox.OLD for orxonox/branches

Timestamp:

May 18, 2005, 2:15:48 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/openAL: audio Buffers will be flushed at the End of the Level

Location:

orxonox/branches/openAL/src

Files:

• lib/sound/sound_engine.cc (modified) (2 diffs)
• lib/sound/sound_engine.h (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)

orxonox/branches/openAL/src/lib/sound/sound_engine.cc

@@ -264 +264 @@
 void SoundEngine::removeBuffer(SoundBuffer* buffer)
 {
+  // look if there are any sources that have the buffer still loaded
+  tIterator<SoundSource>* sourceIterator = this->sourceList->getIterator();
+  SoundSource* enumSource = sourceIterator->nextElement();
+  while (enumSource)
+    {
+      if (buffer == enumSource->getBuffer())
+        delete enumSource;
+      enumSource = sourceIterator->nextElement();
+    }
+  delete sourceIterator;
+
+  // remove the Buffer
   this->bufferList->remove(buffer);
 }
@@ -357 +369 @@
 
 /**
+   \brief SourceEngine::flushAllBuffers
+*/
+void SoundEngine::flushAllBuffers(void)
+{
+    tIterator<SoundBuffer>* bufferIterator = this->bufferList->getIterator();
+  SoundBuffer* enumBuffer = bufferIterator->nextElement();
+  while (enumBuffer)
+    {
+      ResourceManager::getInstance()->unload(enumBuffer, RP_LEVEL);
+      enumBuffer = bufferIterator->nextElement();
+    }
+  delete bufferIterator;
+}
+
+/**
    \brief initializes Audio in general
 */

orxonox/branches/openAL/src/lib/sound/sound_engine.h

@@ -89 +89 @@
   // administrative
   void flushUnusedBuffers(void);
+  void flushAllBuffers(void);
   bool initAudio(void);
 

orxonox/branches/openAL/src/story_entities/world.cc

@@ -208 +208 @@
   delete this->particleEngine;
   TextEngine::getInstance()->flush();
+  SoundEngine::getInstance()->flushAllBuffers();
 
   delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.