diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-28 12:41:34 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-28 12:41:34 +0100 |
| commit | 47fa4bc01478d5ef0311aa491321bfb397777302 (patch) | |
| tree | 7d9ab0c14c56ece7b178dc9d8ab67633cd476af0 /indra/llaudio | |
| parent | b740924c9dbb6a5697254ca238e099a62e7054a9 (diff) | |
| parent | 96df3f3eb1351973d140ba73b507de44b1052c89 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/llaudio')
| -rw-r--r-- | indra/llaudio/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | indra/llaudio/llstreamingaudio_fmod.cpp | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index bfa2c34c12..e869b9717c 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -57,13 +57,11 @@ if (FMOD) llstreamingaudio_fmod.h ) - if (LINUX) - if (${CXX_VERSION_NUMBER} GREATER 419) - set_source_files_properties(llaudioengine_fmod.cpp - llstreamingaudio_fmod.cpp - COMPILE_FLAGS -Wno-write-strings) - endif (${CXX_VERSION_NUMBER} GREATER 419) - endif (LINUX) + if (LINUX OR DARWIN) + set_source_files_properties(llaudioengine_fmod.cpp + llstreamingaudio_fmod.cpp + COMPILE_FLAGS -Wno-write-strings) + endif (LINUX OR DARWIN) endif (FMOD) if (OPENAL) diff --git a/indra/llaudio/llstreamingaudio_fmod.cpp b/indra/llaudio/llstreamingaudio_fmod.cpp index a4620fa13c..fe94688565 100644 --- a/indra/llaudio/llstreamingaudio_fmod.cpp +++ b/indra/llaudio/llstreamingaudio_fmod.cpp @@ -271,7 +271,7 @@ void LLStreamingAudio_FMOD::setGain(F32 vol) if (mFMODInternetStreamChannel != -1) { - vol = llclamp(vol, 0.f, 1.f); + vol = llclamp(vol * vol, 0.f, 1.f); int vol_int = llround(vol * 255.f); FSOUND_SetVolumeAbsolute(mFMODInternetStreamChannel, vol_int); } |