Prefer FmodEx as the default audio engine if the viewer was built with it.

This commit is contained in:
Drake Arconis
2012-07-03 00:22:50 +00:00
parent 7ad1b8731d
commit 2ac4f81424

View File

@@ -660,17 +660,6 @@ bool idle_startup()
{
gAudiop = NULL;
#ifdef LL_OPENAL
if (!gAudiop
#if !LL_WINDOWS
&& NULL == getenv("LL_BAD_OPENAL_DRIVER")
#endif // !LL_WINDOWS
)
{
gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL();
}
#endif
#ifdef LL_FMODEX
if (!gAudiop
#if !LL_WINDOWS
@@ -682,6 +671,17 @@ bool idle_startup()
}
#endif
#ifdef LL_OPENAL
if (!gAudiop
#if !LL_WINDOWS
&& NULL == getenv("LL_BAD_OPENAL_DRIVER")
#endif // !LL_WINDOWS
)
{
gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL();
}
#endif
#ifdef LL_FMOD
if (!gAudiop
#if !LL_WINDOWS