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

Timestamp:

May 19, 2006, 3:07:09 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better debug names
As DEBUG and ERROR are already given to windows.h and other files:
DEBUG is renamed to DEBUG_LEVEL
and all
NO, ERR, WARN, INFO, DEBUG, vDEBUG
are renamed to
ORX_NONE, ORX_ERR, ORX_WARN, ORX_INFO, ORX_DEBUG, ORX_vDEBUG

Location:

trunk/src/lib/sound

Files:

• ogg_player.cc (modified) (6 diffs)
• sound_engine.cc (modified) (3 diffs)
• sound_source.cc (modified) (6 diffs)

trunk/src/lib/sound/ogg_player.cc

@@ -290 +290 @@
 
     alSourceQueueBuffers(this->source, 2, this->buffers);
-    if (DEBUG >= 3)
+    if (DEBUG_LEVEL >= 3)
       SoundEngine::checkError("OggPlayer::playback()::alSourceQueueBuffers", __LINE__);
 
     alSourcePlay(this->source);
-    if (DEBUG >= 3)
+    if (DEBUG_LEVEL >= 3)
       SoundEngine::checkError("OggPlayer::playback()::alSourcePlay", __LINE__);
     SDL_mutexV(this->musicMutex);
@@ -329 +329 @@
 
     alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed);
-    if (DEBUG >= 3)
+    if (DEBUG_LEVEL >= 3)
       SoundEngine::checkError("OggPlayer::update()::alGetSourceI", __LINE__);
 
@@ -337 +337 @@
 
       alSourceUnqueueBuffers(source, 1, &buffer);
-      if (DEBUG >= 3)
+      if (DEBUG_LEVEL >= 3)
         SoundEngine::checkError("OggPlayer::update()::unqueue", __LINE__);
 
@@ -343 +343 @@
 
       alSourceQueueBuffers(source, 1, &buffer);
-      if (DEBUG >= 3)
+      if (DEBUG_LEVEL >= 3)
         SoundEngine::checkError("OggPlayer::update()::queue", __LINE__);
     }
@@ -380 +380 @@
 
     alBufferData(buffer, format, pcm, size, vorbisInfo->rate);
-    if (DEBUG >= 3)
+    if (DEBUG_LEVEL >= 3)
       SoundEngine::checkError("OggPlayer::stream()::BUFFER", __LINE__);
 
@@ -448 +448 @@
 
   /////////////////////
-  // DEBUG FUNCTIONS //
+  // DEBUG_LEVEL FUNCTIONS //
   /////////////////////
   /**

trunk/src/lib/sound/sound_engine.cc

@@ -223 +223 @@
           int play = 0x000;
           alGetSourcei(source->getID(), AL_SOURCE_STATE, &play);
-          if (DEBUG > 2)
+          if (DEBUG_LEVEL > 2)
             SoundEngine::checkError("SoundEngine::update() Play", __LINE__);
           if(play == AL_PLAYING)
@@ -233 +233 @@
                          source->getNode()->getAbsCoor().y,
                          source->getNode()->getAbsCoor().z);
-              if (DEBUG > 2)
+              if (DEBUG_LEVEL > 2)
                 SoundEngine::checkError("SoundEngine::update() Set Source Position", __LINE__);
               alSource3f(source->getID(), AL_VELOCITY,
@@ -239 +239 @@
                          source->getNode()->getVelocity().y,
                          source->getNode()->getVelocity().z);
-              if (DEBUG > 2)
+              if (DEBUG_LEVEL > 2)
                 SoundEngine::checkError("SoundEngine::update() Set Source Velocity", __LINE__);
             }

trunk/src/lib/sound/sound_source.cc

@@ -124 +124 @@
       alSourcePlay(this->sourceID);
 
-      if (DEBUG >= 3)
+      if (DEBUG_LEVEL >= 3)
         SoundEngine::checkError("Play Source", __LINE__);
       this->bPlay = true;
@@ -151 +151 @@
     this->bPlay = true;
 
-    if (DEBUG >= 3)
+    if (DEBUG_LEVEL >= 3)
       SoundEngine::checkError("Play Source", __LINE__);
   }
@@ -165 +165 @@
     {
       alSourceStop(this->sourceID);
-      if (DEBUG >= 3)
+      if (DEBUG_LEVEL >= 3)
         SoundEngine::checkError("StopSource", __LINE__);
       alSourcei(this->sourceID, AL_BUFFER, 0);
@@ -181 +181 @@
   {
     alSourcePause(this->sourceID);
-    if (DEBUG >= 3)
+    if (DEBUG_LEVEL >= 3)
       SoundEngine::checkError("Pause Source", __LINE__);
   }
@@ -193 +193 @@
     alSourceRewind(this->sourceID);
 
-    if (DEBUG >= 3)
+    if (DEBUG_LEVEL >= 3)
       SoundEngine::checkError("Rewind Source", __LINE__);
   }
@@ -208 +208 @@
     alSourcef(this->sourceID, AL_ROLLOFF_FACTOR, rolloffFactor);
 
-    if (DEBUG >= 3)
+    if (DEBUG_LEVEL >= 3)
       SoundEngine::checkError("Set Source Rolloff-factor", __LINE__);
   }