Changeset 6842 in orxonox.OLD

Timestamp:

Jan 30, 2006, 1:39:57 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: ogg-player does not segfault, when no sources are availiable

Location:

trunk/src/lib/sound

Files:

• ogg_player.cc (modified) (9 diffs)
• ogg_player.h (modified) (2 diffs)
• sound_engine.cc (modified) (1 diff)

trunk/src/lib/sound/ogg_player.cc

@@ -35 +35 @@
   this->setClassID(CL_SOUND_OGG_PLAYER, "OggPlayer");
 
+  this->trackLoaded = false;
   this->source = 0;
+  this->buffers[0] = 0;
+  this->buffers[1] = 0;
 
   if (fileName != NULL)
   {
-    this->open(fileName);
-    this->setName(fileName);
+    if (this->open(fileName))
+      this->setName(fileName);
   }
 }
@@ -48 +51 @@
  * @param fileName the file to open
  */
-void OggPlayer::open(const char* fileName)
-{
+bool OggPlayer::open(const char* fileName)
+{
+  if (this->buffers[0] == 0)
+    alGenBuffers(2, this->buffers);
+  SoundEngine::checkError("Allocating Buffers", __LINE__);
+
+  if (this->source == 0)
+    SoundEngine::getInstance()->popALSource(this->source);
+  if (this->source == 0)
+  {
+    this->trackLoaded = false;
+    return false;
+  }
+  printf("OK\n");
+
   int result;
 
@@ -69 +85 @@
   else
     format = AL_FORMAT_STEREO16;
-
-
-  alGenBuffers(2, buffers);
-  check();
-  SoundEngine::getInstance()->popALSource(this->source);
-  check();
 
   alSource3f(source, AL_POSITION,        0.0, 0.0, 0.0);
@@ -82 +92 @@
   alSourcei (source, AL_SOURCE_RELATIVE, AL_TRUE      );
   alSourcef (source, AL_GAIN,            SoundEngine::getInstance()->getMusicVolume());
+
+  this->trackLoaded = true;
+  return true;
 }
 
@@ -92 +105 @@
   empty();
   SoundEngine::getInstance()->pushALSource(source);
+  this->source = 0;
   check();
-  alDeleteBuffers(1, buffers);
+  alDeleteBuffers(2, buffers);
+  this->buffers[0] = 0;
+  this->buffers[1] = 0;
   check();
 
   ov_clear(&oggStream);
+  this->trackLoaded = false;
 }
 
@@ -106 +123 @@
 bool OggPlayer::playback()
 {
+  if (!this->trackLoaded)
+    return false;
+
   if(playing())
     return true;
@@ -127 +147 @@
 bool OggPlayer::playing()
 {
+  if (!this->trackLoaded)
+    return false;
   ALenum state;
 
@@ -140 +162 @@
 bool OggPlayer::update()
 {
+  if (!this->trackLoaded)
+    return false;
+
   int processed;
   bool active = true;
@@ -233 +258 @@
 {
   cout
-      << "version         " << vorbisInfo->version         << "\n"
-      << "channels        " << vorbisInfo->channels        << "\n"
-      << "rate (hz)       " << vorbisInfo->rate            << "\n"
-      << "bitrate upper   " << vorbisInfo->bitrate_upper   << "\n"
-      << "bitrate nominal " << vorbisInfo->bitrate_nominal << "\n"
-      << "bitrate lower   " << vorbisInfo->bitrate_lower   << "\n"
-      << "bitrate window  " << vorbisInfo->bitrate_window  << "\n"
-      << "\n"
-      << "vendor " << vorbisComment->vendor << "\n";
+  << "version         " << vorbisInfo->version         << "\n"
+  << "channels        " << vorbisInfo->channels        << "\n"
+  << "rate (hz)       " << vorbisInfo->rate            << "\n"
+  << "bitrate upper   " << vorbisInfo->bitrate_upper   << "\n"
+  << "bitrate nominal " << vorbisInfo->bitrate_nominal << "\n"
+  << "bitrate lower   " << vorbisInfo->bitrate_lower   << "\n"
+  << "bitrate window  " << vorbisInfo->bitrate_window  << "\n"
+  << "\n"
+  << "vendor " << vorbisComment->vendor << "\n";
 
   for(int i = 0; i < vorbisComment->comments; i++)

trunk/src/lib/sound/ogg_player.h

@@ -29 +29 @@
     OggPlayer(const char* fileName = NULL);
 
-    void open(const char* fileName);
+    bool open(const char* fileName);
     void release();
     void debug();
@@ -53 +53 @@
     ALuint              source;               //!< The source we play back on
     ALenum              format;               //!< The format we play back
+    bool                trackLoaded;          //!< If a Track has been loaded.
   };
 

trunk/src/lib/sound/sound_engine.cc

@@ -337 +337 @@
 
     alGenSources(1, &source);
-    printf("%d %d\n", i, source);
     this->checkError("allocate Source", __LINE__);
+    if (!alIsSource(source))
+    {
+      PRINTF(2)("not allocated Source\n");
+      continue;
+    }
 
     alSourcef (source, AL_PITCH,    1.0      );