Changeset 4207 in orxonox.OLD

Timestamp:

May 17, 2005, 3:22:37 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/openAL: added flush-function i talked of in the Wiki

Location:

orxonox/branches/openAL/src

Files:

• lib/sound/sound_engine.cc (modified) (3 diffs)
• lib/sound/sound_engine.h (modified) (2 diffs)
• orxonox.cc (modified) (1 diff)

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

@@ -190 +190 @@
   SoundEngine::singletonRef = NULL;
 
-  // deleting all the Resources
+  // deleting all the SoundSources
   tIterator<SoundSource>* sourceIterator = this->sourceList->getIterator();
   SoundSource* enumSource = sourceIterator->nextElement();
@@ -200 +200 @@
   delete sourceIterator;
 
+  // deleting all the SoundBuffers
   tIterator<SoundBuffer>* bufferIterator = this->bufferList->getIterator();
   SoundBuffer* enumBuffer = bufferIterator->nextElement();
@@ -315 +316 @@
 
 /**
+   \brief Removes all the Buffers that are not anymore needed by any Sources
+*/
+void SoundEngine::flushUnusedBuffers(void)
+{
+  tIterator<SoundBuffer>* bufferIterator = this->bufferList->getIterator();
+  SoundBuffer* enumBuffer = bufferIterator->nextElement();
+  while (enumBuffer)
+    {
+      tIterator<SoundSource>* sourceIterator = this->sourceList->getIterator();
+      SoundSource* enumSource = sourceIterator->nextElement();
+      while (enumSource)
+        {
+          if (enumBuffer == enumSource->getBuffer())
+            break;
+          enumSource = sourceIterator->nextElement();
+        }
+      delete sourceIterator;
+      if (enumSource == NULL)
+        ResourceManager::getInstance()->unload(enumBuffer);
+      enumBuffer = bufferIterator->nextElement();
+    }
+  delete bufferIterator;
+}
+
+/**
    \brief initializes Audio in general
 */

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

@@ -51 +51 @@
 
   // development functions
-  /** \returns The ID of the Source */
-  inline ALuint getID(void) { return this->sourceID; }
+  /** \returns The ID of this Source */
+  inline ALuint getID(void) const { return this->sourceID; }
+  /** \returns the SoundBuffer of this Source */
+  inline SoundBuffer* getBuffer(void) const { return this->buffer; } 
   /** \returns the SourceNode of this Source */
-  inline PNode* getNode(void) { return this->sourceNode;}
+  inline PNode* getNode(void) const { return this->sourceNode;}
 
   void setRolloffFactor(ALfloat rolloffFactor);
@@ -82 +84 @@
   void removeSource(SoundSource* source);
 
-
   void update(void);
 
+  void flushUnusedBuffers(void);
 
   // error handling:

orxonox/branches/openAL/src/orxonox.cc

@@ -75 +75 @@
   if( resources != NULL) delete resources;
   delete GraphicsEngine::getInstance(); // deleting the Graphics
+  delete TextEngine::getInstance();
+  delete SoundEngine::getInstance();
   delete ResourceManager::getInstance(); // deletes the Resource Manager
-  delete TextEngine::getInstance();
 }