Changeset 7309 in orxonox.OLD for trunk/src

Timestamp:

Apr 16, 2006, 11:46:15 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new Mutex (do not think that it hlps… but hey lets try it )

Location:

trunk/src/lib/sound

Files:

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

trunk/src/lib/sound/ogg_player.cc

@@ -158 +158 @@
 }
 
-
+/**
+ * @brief stop the OggPlayer from Playing.
+ */
 void OggPlayer::stop()
 {
@@ -168 +170 @@
 }
 
+/**
+ * @brief Pause the Playing.
+ */
 void OggPlayer::pause()
 {
@@ -268 +273 @@
   this->state |= OggPlayer::Playing;
 
+  SDL_mutexP(this->musicMutex);
   if(!this->stream(this->buffers[0]) || !this->stream(this->buffers[1]))
-    return false;
+  {
+    return false;
+    SDL_mutexV(this->musicMutex);
+  }
 
   alSourceQueueBuffers(this->source, 2, this->buffers);
@@ -275 +284 @@
     SoundEngine::checkError("OggPlayer::playback()::alSourceQueueBuffers", __LINE__);
 
-
   alSourcePlay(this->source);
   if (DEBUG >= 3)
     SoundEngine::checkError("OggPlayer::playback()::alSourcePlay", __LINE__);
+  SDL_mutexV(this->musicMutex);
   return true;
 }

trunk/src/lib/sound/ogg_player.h

@@ -45 +45 @@
   OggPlayer(const std::string& fileName = "");
   virtual ~OggPlayer();
-  /** @param state compare this State with the internal State */
+  /** @param state compare this State with the internal State @returns true on match */
   bool operator==(OggPlayer::State state) { return this->state & state; };