Changeset 8902 for code/trunk/src/orxonox

Timestamp:

Oct 21, 2011, 5:05:55 PM (13 years ago)

Author:

baermatt

Message:

Outcommented alutInit and alutExit because it caused a crash on Mac OS X. (Does it work on other systems?)

File:

• code/trunk/src/orxonox/sound/SoundManager.cc (modified) (3 diffs)

code/trunk/src/orxonox/sound/SoundManager.cc

@@ -80 +80 @@
         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);*/
 
 /*
@@ -149 +149 @@
 
         // Disarm guards
-        alutExitGuard.Dismiss();
+//      alutExitGuard.Dismiss();
         closeDeviceGuard.Dismiss();
         desroyContextGuard.Dismiss();
@@ -199 +199 @@
         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;*/
     }