Changeset 5955 in orxonox.OLD for branches/powerups/src/lib/sound/sound_buffer.cc

Timestamp:

Dec 7, 2005, 1:05:10 PM (18 years ago)

Author:

bensch

Message:

branches/powerups: merged the trunk to branches/powerup
merged with commandsvn merge ../trunk/ powerups/ -r5848:HEAD
conflicts resolved in favor of the trunk

File:

• branches/powerups/src/lib/sound/sound_buffer.cc (modified) (4 diffs)

branches/powerups/src/lib/sound/sound_buffer.cc

@@ -20 +20 @@
 #include "sound_engine.h"
 
-
 using namespace std;
-
 
 //////////////////
@@ -36 +34 @@
   this->setName(fileName);
 
-  SoundEngine::getInstance()->addBuffer(this);
-
   ALenum format;
   ALvoid* data;
@@ -47 +43 @@
   alGenBuffers(1, &this->bufferID);
   if ((result = alGetError()) != AL_NO_ERROR)
-    SoundEngine::PrintALErrorString(result);
+    PRINTF(2)("%s\n", SoundEngine::getALErrorString(result));
 
   // read in the wav data
@@ -59 +55 @@
 #endif
   if ((result = alGetError()) != AL_NO_ERROR)
-    SoundEngine::PrintALErrorString(result);
+    PRINTF(2)("%s\n", SoundEngine::getALErrorString(result));
 
   // send the loaded wav data to the buffer
   alBufferData(this->bufferID, format, data, this->size, freq);
   if ((result = alGetError()) != AL_NO_ERROR)
-    SoundEngine::PrintALErrorString(result);
+    PRINTF(2)("%s\n", SoundEngine::getALErrorString(result));
 
   // remove the wav data (redundant)
   alutUnloadWAV(format, data, this->size, freq);
   if ((result = alGetError()) != AL_NO_ERROR)
-    SoundEngine::PrintALErrorString(result);
+    PRINTF(2)("%s\n", SoundEngine::getALErrorString(result));
 }