[Orxonox-commit 4231] r8902 - code/trunk/src/orxonox/sound

[baermatt at orxonox.net]

Author: baermatt
Date: 2011-10-21 17:05:55 +0200 (Fri, 21 Oct 2011)
New Revision: 8902

Modified:
   code/trunk/src/orxonox/sound/SoundManager.cc
Log:
Outcommented alutInit and alutExit because it caused a crash on Mac OS X. (Does it work on other systems?)

Modified: code/trunk/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/trunk/src/orxonox/sound/SoundManager.cc	2011-10-21 13:28:08 UTC (rev 8901)
+++ code/trunk/src/orxonox/sound/SoundManager.cc	2011-10-21 15:05:55 UTC (rev 8902)
@@ -79,9 +79,9 @@
         SetConfigValue(bDisableSound_, false);
         if (bDisableSound_)
             ThrowException(InitialisationAborted, "Sound: Not loading at all");
-        if (!alutInitWithoutContext(NULL, NULL))
+/*      if (!alutInitWithoutContext(NULL, NULL))
             ThrowException(InitialisationFailed, "Sound Error: ALUT initialisation failed: " << alutGetErrorString(alutGetError()));
-        Loki::ScopeGuard alutExitGuard = Loki::MakeGuard(&alutExit);
+        Loki::ScopeGuard alutExitGuard = Loki::MakeGuard(&alutExit);*/
 
 /*
         // Get list of available sound devices and display them
@@ -148,7 +148,7 @@
         this->createSoundSources(this->minSources_ - 1);
 
         // Disarm guards
-        alutExitGuard.Dismiss();
+//      alutExitGuard.Dismiss();
         closeDeviceGuard.Dismiss();
         desroyContextGuard.Dismiss();
         resetPlaysSoundGuard.Dismiss();
@@ -198,8 +198,8 @@
 #else
         alcCloseDevice(this->device_);
 #endif
-        if (!alutExit())
-            orxout(internal_error, context::sound) << "Closing ALUT failed: " << alutGetErrorString(alutGetError()) << endl;
+/*      if (!alutExit())
+            orxout(internal_error, context::sound) << "Closing ALUT failed: " << alutGetErrorString(alutGetError()) << endl;*/
     }
 
     void SoundManager::setConfigValues()