Changeset 7310 in orxonox.OLD for trunk/src

Timestamp:

Apr 17, 2006, 12:07:57 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: added a simple class MutexLock, that acts as a ScopeThreadMutex

Location:

trunk/src/lib/sound

Files:

• ogg_player.cc (modified) (3 diffs)
• ogg_player.h (modified) (1 diff)

trunk/src/lib/sound/ogg_player.cc

@@ -69 +69 @@
 bool OggPlayer::open(const std::string& fileName)
 {
+  MutexLock(this->musicMutex);
   // release old Ogg-File (if loaded)
   if (this->state & OggPlayer::FileOpened)
@@ -300 +301 @@
   {
     assert (!(this->state & Playing));
-    this->printState();
     SDL_WaitThread(this->musicThreadID, NULL);
     this->musicThreadID = NULL;
@@ -389 +389 @@
     if (this->state & OggPlayer::Playing);
     {
+      // Kill the Music Thread.
       this->state &= ~OggPlayer::Playing;
-      // Kill the Music Thread.
-      if (this->musicThreadID != NULL)
-        this->suspend();
+      this->suspend();
 
       SoundEngine::checkError("OggPlayer::release()::alSourceStop", __LINE__);

trunk/src/lib/sound/ogg_player.h

@@ -89 +89 @@
   SDL_Thread*         musicThreadID;        //!< The Thread in which music is Played back.
   SDL_mutex*          musicMutex;           //!< A Mutex so that the two threads do not interfere.
+
+  class MutexLock
+  {
+  public:
+    MutexLock(SDL_mutex* mutex) { SDL_mutexP(mutex); this->mutex = mutex; };
+    ~MutexLock() { SDL_mutexV(mutex); };
+  private:
+    SDL_mutex* mutex;
+  };
 };