Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8903


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/sound/SoundManager.cc

    r8902 r8903  
    8080        if (bDisableSound_)
    8181            ThrowException(InitialisationAborted, "Sound: Not loading at all");
    82 /*      if (!alutInitWithoutContext(NULL, NULL))
     82#if !defined(ORXONOX_PLATFORM_APPLE)
     83        if (!alutInitWithoutContext(NULL, NULL))
    8384            ThrowException(InitialisationFailed, "Sound Error: ALUT initialisation failed: " << alutGetErrorString(alutGetError()));
    84         Loki::ScopeGuard alutExitGuard = Loki::MakeGuard(&alutExit);*/
     85        Loki::ScopeGuard alutExitGuard = Loki::MakeGuard(&alutExit);
     86#endif
    8587
    8688/*
     
    149151
    150152        // Disarm guards
    151 //      alutExitGuard.Dismiss();
     153#if !defined(ORXONOX_PLATFORM_APPLE)
     154        alutExitGuard.Dismiss();
     155#endif
    152156        closeDeviceGuard.Dismiss();
    153157        desroyContextGuard.Dismiss();
     
    199203        alcCloseDevice(this->device_);
    200204#endif
    201 /*      if (!alutExit())
    202             orxout(internal_error, context::sound) << "Closing ALUT failed: " << alutGetErrorString(alutGetError()) << endl;*/
     205#if !defined(ORXONOX_PLATFORM_APPLE)
     206        if (!alutExit())
     207            orxout(internal_error, context::sound) << "Closing ALUT failed: " << alutGetErrorString(alutGetError()) << endl;
     208#endif
    203209    }
    204210
Note: See TracChangeset for help on using the changeset viewer.