diff options
| author | callum_linden <none@none> | 2013-02-01 08:44:52 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2013-02-01 08:44:52 -0800 |
| commit | b0f2f02333a87598299b490a1e42eb42a8125f74 (patch) | |
| tree | 8d1fe612b4ca516a3b8c97caa73efa1f9e836275 /indra/newview/llstartup.cpp | |
| parent | 9b86b8bf3d822bbeefb8518fb335e81a6dc7f3b3 (diff) | |
Removed (most) references to older FMOD library - still a little Linux clean up left
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 6a874d1af5..18ef36a893 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -41,10 +41,6 @@ # include "llaudioengine_fmodex.h" #endif -#ifdef LL_FMOD -# include "llaudioengine_fmod.h" -#endif - #ifdef LL_OPENAL #include "llaudioengine_openal.h" #endif @@ -648,22 +644,11 @@ bool idle_startup() gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL(); } #endif - -#ifdef LL_FMOD - if (!gAudiop -#if !LL_WINDOWS - && NULL == getenv("LL_BAD_FMOD_DRIVER") -#endif // !LL_WINDOWS - ) - { - gAudiop = (LLAudioEngine *) new LLAudioEngine_FMOD(); - } -#endif - + if (gAudiop) { #if LL_WINDOWS - // FMOD on Windows needs the window handle to stop playing audio + // FMOD Ex on Windows needs the window handle to stop playing audio // when window is minimized. JC void* window_handle = (HWND)gViewerWindow->getPlatformWindow(); #else |