diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-19 14:42:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-19 14:42:56 -0400 |
| commit | 3bb708d70636188b91a6e8476a3b899441de0468 (patch) | |
| tree | 85790d906bed73e19138004c4a54fc3fed952d85 /indra/newview/llstartup.cpp | |
| parent | 327c99cadbcbe15442eaee8e0625ade17dcda61f (diff) | |
| parent | ddd5659f815a39e9a8ef0e86c911fea75a7d8848 (diff) | |
merge up to latest viewer-development for merge to 3.5.2
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llstartup.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 51dfaa56e8..82596a86b9 100644..100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -38,8 +38,8 @@ #include "llviewermedia_streamingaudio.h" #include "llaudioengine.h" -#ifdef LL_FMOD -# include "llaudioengine_fmod.h" +#ifdef LL_FMODEX +# include "llaudioengine_fmodex.h" #endif #ifdef LL_OPENAL @@ -624,32 +624,32 @@ bool idle_startup() { gAudiop = NULL; -#ifdef LL_OPENAL +#ifdef LL_FMODEX if (!gAudiop #if !LL_WINDOWS - && NULL == getenv("LL_BAD_OPENAL_DRIVER") + && NULL == getenv("LL_BAD_FMODEX_DRIVER") #endif // !LL_WINDOWS ) { - gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL(); + gAudiop = (LLAudioEngine *) new LLAudioEngine_FMODEX(gSavedSettings.getBOOL("FMODExProfilerEnable")); } #endif -#ifdef LL_FMOD +#ifdef LL_OPENAL if (!gAudiop #if !LL_WINDOWS - && NULL == getenv("LL_BAD_FMOD_DRIVER") + && NULL == getenv("LL_BAD_OPENAL_DRIVER") #endif // !LL_WINDOWS ) { - gAudiop = (LLAudioEngine *) new LLAudioEngine_FMOD(); + gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL(); } #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 |