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

Timestamp:

May 19, 2006, 11:38:34 PM (19 years ago)

Author:

bensch

Message:

Using MultiLine-Text in the Shell. This is much faster, and Nicer

Location:

trunk/src/lib/sound

Files:

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

trunk/src/lib/sound/ogg_player.cc

@@ -48 +48 @@
     this->buffers[1] = 0;
     this->musicThreadID = NULL;
-    this->musicMutex = SDL_CreateMutex();
 
     if (!fileName.empty())
@@ -64 +63 @@
   {
     this->release();
-    SDL_DestroyMutex(this->musicMutex);
   }
 
@@ -76 +74 @@
   bool OggPlayer::open(const std::string& fileName)
   {
-    MutexLock(this->musicMutex);
+    OrxThread::MutexLock musicLock(&this->musicMutex);
     // release old Ogg-File (if loaded)
     if (this->state & OggPlayer::FileOpened)
@@ -208 +206 @@
     if (this->state & OggPlayer::FileOpened)
     {
-      SDL_mutexP(this->musicMutex);
+      OrxThread::MutexLock musicLock(&this->musicMutex);
       ov_time_seek(&this->oggStream, timeCode);
-      SDL_mutexV(this->musicMutex);
     }
   }
@@ -259 +256 @@
     while (ogg->state & OggPlayer::Playing)
     {
-      SDL_mutexP(ogg->musicMutex);
-      ogg->update();
-      SDL_mutexV(ogg->musicMutex);
+      {
+        OrxThread::MutexLock musicLock(&ogg->musicMutex);
+        ogg->update();
+      }
       SDL_Delay(1);
     }
@@ -281 +279 @@
     this->state |= OggPlayer::Playing;
 
-    SDL_mutexP(this->musicMutex);
+    OrxThread::MutexLock musicLock(&this->musicMutex);
     if(!this->stream(this->buffers[0]) || !this->stream(this->buffers[1]))
     {
-      SDL_mutexV(this->musicMutex);
       this->state &= ~OggPlayer::Playing;
       return false;
@@ -296 +293 @@
     if (DEBUG_LEVEL >= 3)
       SoundEngine::checkError("OggPlayer::playback()::alSourcePlay", __LINE__);
-    SDL_mutexV(this->musicMutex);
     return true;
   }
@@ -502 +498 @@
     switch(code)
     {
-    case OV_EREAD:
-      return ("Read from media.");
-    case OV_ENOTVORBIS:
-      return ("Not Vorbis data.");
-    case OV_EVERSION:
-      return ("Vorbis version mismatch.");
-    case OV_EBADHEADER:
-      return ("Invalid Vorbis header.");
-    case OV_EFAULT:
-      return ("Internal logic fault (bug or heap/stack corruption.");
-    default:
-      return ("Unknown Ogg error.");
+      case OV_EREAD:
+        return ("Read from media.");
+      case OV_ENOTVORBIS:
+        return ("Not Vorbis data.");
+      case OV_EVERSION:
+        return ("Vorbis version mismatch.");
+      case OV_EBADHEADER:
+        return ("Invalid Vorbis header.");
+      case OV_EFAULT:
+        return ("Internal logic fault (bug or heap/stack corruption.");
+      default:
+        return ("Unknown Ogg error.");
     }
   }

trunk/src/lib/sound/ogg_player.h

@@ -87 +87 @@
 
     SDL_Thread*         musicThreadID;        //!< The Thread in which music is Played back.
-    SDL_mutex*          musicMutex;           //!< A Mutex so that the two threads do not interfere.
+    OrxThread::Mutex    musicMutex;           //!< A Mutex so that the two threads do not interfere.
   };