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

Timestamp:

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

Author:

bensch

Message:

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

File:

• trunk/src/lib/sound/ogg_player.cc (modified) (5 diffs)

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.");
+}
 
 /**