Changeset 7298 in orxonox.OLD

Timestamp:

Apr 15, 2006, 10:00:35 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: secured the sources-list with a fancy mutex. This should prevent source-stack-errors… (if they would ever occure )

Location:

trunk/src/lib/sound

Files:

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

trunk/src/lib/sound/sound_engine.cc

@@ -54 +54 @@
   this->effectsVolume = .80;
   this->musicVolume = .75;
+
+  this->sourceMutex = SDL_CreateMutex();
 }
 
@@ -97 +99 @@
   //alutExit();
 
+  SDL_DestroyMutex(this->sourceMutex);
+
   SoundEngine::singletonRef = NULL;
 }
@@ -150 +154 @@
   if (!this->ALSources.empty())
   {
+    SDL_mutexP(this->sourceMutex);
     source = this->ALSources.top();
     this->ALSources.pop();
+    SDL_mutexV(this->sourceMutex);
     printf("Retrieve Source %d\n", source);
   }
 }
+
+void SoundEngine::pushALSource(ALuint& source)
+{
+  if (source != 0)
+  {
+    SDL_mutexP(this->sourceMutex);
+    this->ALSources.push(source);
+    SDL_mutexV(this->sourceMutex);
+  }
+};
 
 

trunk/src/lib/sound/sound_engine.h

@@ -15 +15 @@
 #include <list>
 #include <stack>
+#include <SDL_thread.h>
 
 #define SOUND_DOPPLER_FACTOR       0.001          //!< A factor for the audible doppler effect
@@ -49 +50 @@
   // administrative
     void popALSource(ALuint& source);
-    void pushALSource(ALuint& source) { if (source != 0) this->ALSources.push(source); };
+    void pushALSource(ALuint& source);
 
     void flushUnusedBuffers();
@@ -84 +85 @@
     unsigned int                   maxSourceCount;           //!< How many Sources is the Maximum
     std::stack<ALuint>             ALSources;                //!< A list of real openAL-Sources, the engine allocates, and stores for reuse.
+
+    SDL_mutex*                     sourceMutex;              //!< A mutex so we can not harm the stack
 };