Changeset 5779 in orxonox.OLD for trunk/src/lib/sound

Timestamp:

Nov 26, 2005, 2:20:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ClassList is now in std::list style
ShellCommand is now in std::list style

Location:

trunk/src/lib/sound

Files:

• sound_engine.cc (modified) (8 diffs)
• sound_engine.h (modified) (3 diffs)

trunk/src/lib/sound/sound_engine.cc

@@ -63 +63 @@
   if(this->sourceList != NULL)
   {
-    tIterator<BaseObject>* sourceIterator = this->sourceList->getIterator();
-    SoundSource* enumSource = (SoundSource*)sourceIterator->firstElement();
-    while (enumSource)
-    {
-        delete enumSource;
-        enumSource = (SoundSource*)sourceIterator->nextElement();
-    }
-    delete sourceIterator;
+    while (this->sourceList->size() > 0)
+      delete dynamic_cast<SoundSource*>(this->sourceList->front());
   }
 
@@ -76 +70 @@
   if (this->bufferList != NULL)
   {
-    tIterator<BaseObject>* bufferIterator = this->bufferList->getIterator();
-    SoundBuffer* enumBuffer = (SoundBuffer*)bufferIterator->firstElement();
-    while (enumBuffer)
-    {
-      ResourceManager::getInstance()->unload(enumBuffer);
-      enumBuffer = (SoundBuffer*)bufferIterator->nextElement();
-    }
-    delete bufferIterator;
+    while(this->bufferList->size() > 0)
+      ResourceManager::getInstance()->unload(dynamic_cast<SoundBuffer*>(this->bufferList->front()));
   }
 
@@ -148 +136 @@
 {
   // look if there are any sources that have the buffer still loaded
-  tIterator<BaseObject>* sourceIterator = this->sourceList->getIterator();
-  SoundSource* enumSource = (SoundSource*)sourceIterator->firstElement();
-  while (enumSource)
-    {
-      if (buffer == enumSource->getBuffer())
-        delete enumSource;
-      enumSource = (SoundSource*)sourceIterator->nextElement();
+  if (this->sourceList != NULL)
+  {
+    list<BaseObject*>::iterator source;
+    for (source = this->sourceList->begin(); source != this->sourceList->end(); source++)
+    {
+      if (buffer == static_cast<SoundSource*>(*source)->getBuffer())
+        delete (*source);
     }
-  delete sourceIterator;
+  }
 }
 
@@ -195 +183 @@
   if (likely(this->sourceList != NULL))
   {
-    tIterator<BaseObject>* iterator = this->sourceList->getIterator();
-    SoundSource* enumSource = (SoundSource*)iterator->firstElement();
-    while (enumSource)
-    {
-      if (likely(enumSource->getNode() != NULL))
+    list<BaseObject*>::iterator sourceIT;
+    SoundSource* source;
+    for (sourceIT = this->sourceList->begin(); sourceIT != this->sourceList->end(); sourceIT++)
+    {
+      source = static_cast<SoundSource*>(*sourceIT);
+      if (likely(source->getNode() != NULL))
       {
-        alSource3f(enumSource->getID(), AL_POSITION,
-                   enumSource->getNode()->getAbsCoor().x,
-                   enumSource->getNode()->getAbsCoor().y,
-                   enumSource->getNode()->getAbsCoor().z);
-        alSource3f(enumSource->getID(), AL_VELOCITY,
-                   enumSource->getNode()->getVelocity().x,
-                   enumSource->getNode()->getVelocity().y,
-                   enumSource->getNode()->getVelocity().z);
+        alSource3f(source->getID(), AL_POSITION,
+                   source->getNode()->getAbsCoor().x,
+                   source->getNode()->getAbsCoor().y,
+                   source->getNode()->getAbsCoor().z);
+        alSource3f(source->getID(), AL_VELOCITY,
+                   source->getNode()->getVelocity().x,
+                   source->getNode()->getVelocity().y,
+                   source->getNode()->getVelocity().z);
       }
-      enumSource = (SoundSource*)iterator->nextElement();
     }
-    delete iterator;
   }
 }
@@ -221 +208 @@
 void SoundEngine::flushUnusedBuffers()
 {
-  if(this->sourceList && this->bufferList)
+/*  if(this->sourceList && this->bufferList)
   {
     tIterator<BaseObject>* bufferIterator = this->bufferList->getIterator();
@@ -241 +228 @@
     }
     delete bufferIterator;
-  }
+}*/ /// FIXME
 }
 
@@ -252 +239 @@
   if (this->bufferList)
   {
-    tIterator<BaseObject>* bufferIterator = this->bufferList->getIterator();
-    SoundBuffer* enumBuffer = (SoundBuffer*)bufferIterator->firstElement();
-    while (enumBuffer)
-    {
-      ResourceManager::getInstance()->unload(enumBuffer, RP_LEVEL);
-      enumBuffer = (SoundBuffer*)bufferIterator->nextElement();
-    }
-    delete bufferIterator;
+    while (this->bufferList->size() > 0)
+      ResourceManager::getInstance()->unload(static_cast<SoundBuffer*>(this->bufferList->front()), RP_LEVEL);
   }
 }
@@ -270 +251 @@
   if (this->sourceList)
   {
-    tIterator<BaseObject>* Iterator = this->sourceList->getIterator();
-    SoundSource* enumSource = (SoundSource*)Iterator->firstElement();
-    while (enumSource)
-    {
-      delete enumSource;
-      enumSource = (SoundSource*)Iterator->nextElement();
-    }
-    delete Iterator;
+    while(this->sourceList->size() > 0)
+      delete this->sourceList->front();
   }
 }

trunk/src/lib/sound/sound_engine.h

@@ -13 +13 @@
 #include "sound_source.h"
 
+#include <list>
+
 #define SOUND_DOPPLER_FACTOR       0.001          //!< A factor for the audible doppler effect
 #define SOUND_DOPPLER_VELOCITY     5000000        //!< A factor for the TravelSpeed of sound
@@ -18 +20 @@
 // FORWARD DECLARATION
 class PNode;
-template<class T> class tList;
 class IniParser;
 
@@ -70 +71 @@
     float                    effectsVolume;            //!< the maximum volume of sound-effects in % (0f,1f]
     PNode*                   listener;                 //!< The listener of the Scene
-    tList<BaseObject>*       bufferList;               //!< A list of buffers
-    tList<BaseObject>*       sourceList;               //!< A list for all the sources in the scene.
+    std::list<BaseObject*>*  bufferList;               //!< A list of buffers
+    std::list<BaseObject*>*  sourceList;               //!< A list for all the sources in the scene.
 
 };