diff options
| author | Martin Reddy <lynx@lindenlab.com> | 2009-10-13 16:04:09 +0000 |
|---|---|---|
| committer | Martin Reddy <lynx@lindenlab.com> | 2009-10-13 16:04:09 +0000 |
| commit | 330e635c2ce2ea0650226f56559cf1068df0320d (patch) | |
| tree | 3351dc4dda3868262b5783e1f08cd7a9e27ebfb9 /indra/llaudio | |
| parent | 25f3546626a9912c30e34913c6fda1719edf80ff (diff) | |
DEV-40417: Fixed a few cases where gcc 4.x can emit warnings
suggesting the use of extra parentheses.
Diffstat (limited to 'indra/llaudio')
| -rw-r--r-- | indra/llaudio/llaudioengine_fmod.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/llaudio/llaudioengine_fmod.cpp b/indra/llaudio/llaudioengine_fmod.cpp index 7b12b62d53..d7f58defca 100644 --- a/indra/llaudio/llaudioengine_fmod.cpp +++ b/indra/llaudio/llaudioengine_fmod.cpp @@ -132,6 +132,7 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata) bool audio_ok = false; if (!audio_ok) + { if (NULL == getenv("LL_BAD_FMOD_ESD")) /*Flawfinder: ignore*/ { LL_DEBUGS("AppInit") << "Trying ESD audio output..." << LL_ENDL; @@ -148,8 +149,9 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata) } else { LL_DEBUGS("AppInit") << "ESD audio output SKIPPED" << LL_ENDL; } - + } if (!audio_ok) + { if (NULL == getenv("LL_BAD_FMOD_OSS")) /*Flawfinder: ignore*/ { LL_DEBUGS("AppInit") << "Trying OSS audio output..." << LL_ENDL; @@ -165,8 +167,9 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata) } else { LL_DEBUGS("AppInit") << "OSS audio output SKIPPED" << LL_ENDL; } - + } if (!audio_ok) + { if (NULL == getenv("LL_BAD_FMOD_ALSA")) /*Flawfinder: ignore*/ { LL_DEBUGS("AppInit") << "Trying ALSA audio output..." << LL_ENDL; @@ -182,7 +185,7 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata) } else { LL_DEBUGS("AppInit") << "OSS audio output SKIPPED" << LL_ENDL; } - + } if (!audio_ok) { LL_WARNS("AppInit") << "Overall audio init failure." << LL_ENDL; |