Changeset 8903 for code/trunk

Timestamp:

Oct 22, 2011, 3:28:35 PM (13 years ago)

Author:

baermatt

Message:

Just excluding alutInit and alutExit on Mac OS X, because it causes an internal warning.

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 !defined(ORXONOX_PLATFORM_APPLE)
+        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);
+#endif
 
 /*
@@ -149 +151 @@
 
         // Disarm guards
-//      alutExitGuard.Dismiss();
+#if !defined(ORXONOX_PLATFORM_APPLE)
+        alutExitGuard.Dismiss();
+#endif
         closeDeviceGuard.Dismiss();
         desroyContextGuard.Dismiss();
@@ -199 +203 @@
         alcCloseDevice(this->device_);
 #endif
-/*      if (!alutExit())
-            orxout(internal_error, context::sound) << "Closing ALUT failed: " << alutGetErrorString(alutGetError()) << endl;*/
+#if !defined(ORXONOX_PLATFORM_APPLE)
+        if (!alutExit())
+            orxout(internal_error, context::sound) << "Closing ALUT failed: " << alutGetErrorString(alutGetError()) << endl;
+#endif
     }