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

Timestamp:

Apr 13, 2006, 10:41:48 PM (19 years ago)

Author:

bensch

Message:

merged back with:
svn merge . . -rHEAD:PREV

Location:

trunk/src/lib/sound

Files:

• ogg_player.cc (modified) (5 diffs)
• ogg_player.h (modified) (1 diff)
• sound_source.cc (modified) (1 diff)

trunk/src/lib/sound/ogg_player.cc

@@ -115 +115 @@
   SoundEngine::getInstance()->pushALSource(source);
   this->source = 0;
-  SoundEngine::checkError("OggPlayer::release Source", __LINE__);
+  check();
   alDeleteBuffers(2, buffers);
   this->buffers[0] = 0;
   this->buffers[1] = 0;
-  SoundEngine::checkError("OggPlayer::release", __LINE__);
+  check();
 
   ov_clear(&oggStream);
@@ -184 +184 @@
 
     alSourceUnqueueBuffers(source, 1, &buffer);
-    SoundEngine::checkError("OggPlayer::update() error", __LINE__);
+    check();
 
     active = stream(buffer);
 
     alSourceQueueBuffers(source, 1, &buffer);
-    SoundEngine::checkError("OggPlayer::update()", __LINE__);
+    check();
   }
 
@@ -226 +226 @@
 
   alBufferData(buffer, format, pcm, size, vorbisInfo->rate);
-  SoundEngine::checkError("OggPlayer::stream()", __LINE__);
+  check();
 
   return true;
@@ -246 +246 @@
 
     alSourceUnqueueBuffers(source, 1, &buffer);
-    SoundEngine::checkError("OggPlayer::empty()", __LINE__);
+    check();
   }
 }
@@ -273 +273 @@
 }
 
+/**
+ * checks for errors
+ */
+void OggPlayer::check()
+{
+  int error = alGetError();
+  if(error != AL_NO_ERROR)
+    PRINTF(2)("OpenAL error was raised.");
+}
 
 /**

trunk/src/lib/sound/ogg_player.h

@@ -41 +41 @@
   bool stream(ALuint buffer);
   void empty();
+  void check();
   const char* errorString(int code);
 

trunk/src/lib/sound/sound_source.cc

@@ -68 +68 @@
   if (unlikely(this->sourceID == 0))
     SoundEngine::getInstance()->popALSource(this->sourceID);
-  //assert (this->sourceID != 0);
+  assert (this->sourceID != 0);
 
   alSourceStop(this->sourceID);