[Orxonox-commit 3845] r8521 - code/trunk/src/orxonox/sound

[youngk at orxonox.net]

Author: youngk
Date: 2011-05-20 09:46:05 +0200 (Fri, 20 May 2011)
New Revision: 8521

Modified:
   code/trunk/src/orxonox/sound/BaseSound.cc
   code/trunk/src/orxonox/sound/SoundManager.cc
Log:
Reverting changes from last commit concerning debug output.

Modified: code/trunk/src/orxonox/sound/BaseSound.cc
===================================================================
--- code/trunk/src/orxonox/sound/BaseSound.cc	2011-05-20 03:51:21 UTC (rev 8520)
+++ code/trunk/src/orxonox/sound/BaseSound.cc	2011-05-20 07:46:05 UTC (rev 8521)
@@ -50,18 +50,12 @@
         , pitch_ (1.0)
     {
         RegisterRootObject(BaseSound);
-        
-        if (int error = alGetError())
-            COUT(4) << "Sound: Received ALError before alIsSource(): " << SoundManager::getALErrorString(error) << std::endl;
 
         // Initialise audioSource_ to a value that is not a source
         // 0 is unfortunately not guaranteed to be no source ID.
         // HACK!
         this->audioSource_ = 0;
-        while (alIsSource(++this->audioSource_));
-        
-        if (int error = alGetError())
-            COUT(4) << "Sound: Received ALError after alIsSource(): " << SoundManager::getALErrorString(error) << std::endl;
+        //while (alIsSource(++this->audioSource_));
     }
 
     BaseSound::~BaseSound()

Modified: code/trunk/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/trunk/src/orxonox/sound/SoundManager.cc	2011-05-20 03:51:21 UTC (rev 8520)
+++ code/trunk/src/orxonox/sound/SoundManager.cc	2011-05-20 07:46:05 UTC (rev 8521)
@@ -71,13 +71,6 @@
         RegisterRootObject(SoundManager);
 
         this->bDestructorCalled_ = false;
-
-        // Clear error messages (might be problematic on some systems)
-        //alGetError();
-        //alutGetError();
-        
-        if (int error = alGetError())
-            COUT(0) << "SOUND_DEBUG: Received ALError in constructor of SoundManager: " << SoundManager::getALErrorString(error) << std::endl;
          
         // See whether we even want to load
         bool bDisableSound_ = false;
@@ -142,7 +135,7 @@
 
         this->setConfigValues();
 
-        // Try to get at least one source
+        // Try to get exactly one source
         ALuint source;
         alGenSources(1, &source);
         if (!alGetError() && alIsSource(source))