Changeset 7293 in orxonox.OLD for trunk/src

Timestamp:

Apr 14, 2006, 12:19:55 PM (19 years ago)

Author:

bensch

Message:

OggPlayer::state

Location:

trunk/src/lib/sound

Files:

• ogg_player.cc (modified) (10 diffs)
• ogg_player.h (modified) (3 diffs)

trunk/src/lib/sound/ogg_player.cc

@@ -35 +35 @@
   this->setClassID(CL_SOUND_OGG_PLAYER, "OggPlayer");
 
-  this->trackLoaded = false;
+  this->state = None;
+
   this->source = 0;
   this->buffers[0] = 0;
@@ -58 +59 @@
 bool OggPlayer::open(const std::string& fileName)
 {
+  // release old State
+  if (state & FileOpened)
+    release();
+
+  // allocating Buffers
   if (this->buffers[0] == 0)
     alGenBuffers(2, this->buffers);
   SoundEngine::checkError("Allocating Buffers", __LINE__);
-
+  if (this->buffers[0] != 0 && this->buffers[1] != 0)
+    state |= BuffersAllocated;
+  else  {
+    PRINTF(2)("Unable to allocate al-Buffers\n");
+    this->release();
+    return false;
+  }
+  // allocating source
   if (this->source == 0)
     SoundEngine::getInstance()->popALSource(this->source);
-  if (this->source == 0)
-  {
-    this->trackLoaded = false;
-    return false;
-  }
-
+  if (this->source != 0)
+    state |= SourceAllocated;
+  else
+  {
+    PRINTF(2)("No more Sources Availiable (maybe you should consider raising the source-count\n");
+    this->release();
+    return false;
+  }
+
+  // opening the FILE;
   int result;
-
   if(!(oggFile = fopen(fileName.c_str(), "rb")))
   {
     PRINTF(2)("Could not open Ogg file.");
-    return false;
-  }
-
+    this->release();
+    return false;
+  }
+  // reading the Stream.
   if((result = ov_open(oggFile, &oggStream, NULL, 0)) < 0)
   {
     PRINTF(2)("Could not open Ogg stream. %s", errorString(result));
     fclose(oggFile);
-    return false;
-  }
-
+    this->release();
+    return false;
+  }
+
+  // acquiring the vorbis-properties.
   vorbisInfo = ov_info(&oggStream, -1);
   vorbisComment = ov_comment(&oggStream, -1);
-
+  this->state |= FileOpened;
   if(vorbisInfo->channels == 1)
     format = AL_FORMAT_MONO16;
@@ -93 +112 @@
     format = AL_FORMAT_STEREO16;
 
+  // setting the Source Properties.
   alSource3f(source, AL_POSITION,        0.0, 0.0, 0.0);
   alSource3f(source, AL_VELOCITY,        0.0, 0.0, 0.0);
@@ -101 +121 @@
   SoundEngine::checkError("OggPlayer::SetSourceProperties", __LINE__);
 
-  this->trackLoaded = true;
   return true;
 }
@@ -110 +129 @@
 void OggPlayer::release()
 {
-  if (!this->trackLoaded)
-    return;
-  alSourceStop(source);
-  SoundEngine::checkError("OggPlayer::release()::alSourceStop", __LINE__);
-  empty();
-  SoundEngine::getInstance()->pushALSource(source);
-  this->source = 0;
-  alDeleteBuffers(2, buffers);
-  SoundEngine::checkError("OggPlayer::release()::alDeleteBuffers", __LINE__);
-  this->buffers[0] = 0;
-  this->buffers[1] = 0;
-
-  ov_clear(&oggStream);
-  this->trackLoaded = false;
+  if (this->state & SourceAllocated)
+  {
+    assert(alIsSource(this->source));
+    if (this->state & Playing);
+    {
+      alSourceStop(source);
+      SoundEngine::checkError("OggPlayer::release()::alSourceStop", __LINE__);
+      this->state & !Playing;
+    }
+    empty();
+    SoundEngine::getInstance()->pushALSource(source);
+    this->source = 0;
+    this->state &= !SourceAllocated;
+  }
+  if (this->state & BuffersAllocated)
+  {
+    assert (this->buffers[0] != 0 && this->buffers[1] != 0);
+    alDeleteBuffers(2, buffers);
+    SoundEngine::checkError("OggPlayer::release()::alDeleteBuffers", __LINE__);
+    this->buffers[0] = 0;
+    this->buffers[1] = 0;
+    this->state &= !BuffersAllocated;
+  }
+
+  if (this->state & FileOpened)
+  {
+    ov_clear(&oggStream);
+    this->state &= ! FileOpened;
+  }
 }
 
@@ -133 +167 @@
 bool OggPlayer::playback()
 {
-  if (!this->trackLoaded)
+  if (!(this->state & FileOpened))
     return false;
 
@@ -148 +182 @@
   if (DEBUG >= 3)
     SoundEngine::checkError("OggPlayer::playback()::alSourcePlay", __LINE__);
-  printf("%d\n", this->source);
+  this->state |= Playing;
   return true;
 }
@@ -158 +192 @@
 bool OggPlayer::playing()
 {
-  if (!this->trackLoaded)
+  if (!(this->state & FileOpened))
     return false;
   ALenum state;
@@ -173 +207 @@
 bool OggPlayer::update()
 {
-  if (unlikely(!this->trackLoaded))
+  if (unlikely(!(this->state & Playing)))
     return false;
 
@@ -208 +242 @@
 bool OggPlayer::stream(ALuint buffer)
 {
-  if (!this->trackLoaded)
+  if (unlikely(!(this->state & Playing)))
     return false;
   char pcm[BUFFER_SIZE];

trunk/src/lib/sound/ogg_player.h

@@ -17 +17 @@
 
 struct File;
-
 
 
@@ -42 +41 @@
   const char* errorString(int code);
 
+  public:
+    typedef enum {
+      None                   = 0x000,
+      FileOpened             = 0x100,
+      SourceAllocated        = 0x200,
+      BuffersAllocated       = 0x400,
+      Stopped                = 0x010,
+      Playing                = 0x020,
+      Paused                 = 0x040,
+      Error                  = 0x001,
+    } State;
+
 private:
   FILE*               oggFile;              //!< general file-handler, to open the sound-file
@@ -51 +62 @@
   ALuint              source;               //!< The source we play back on
   ALenum              format;               //!< The format we play back
-  bool                trackLoaded;          //!< If a Track has been loaded.
+  unsigned int        state;
+  //bool                trackLoaded;          //!< If a Track has been loaded.
 };