diff options
Diffstat (limited to 'linden/indra/llaudio/audioengine_fmod.cpp')
-rw-r--r-- | linden/indra/llaudio/audioengine_fmod.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/linden/indra/llaudio/audioengine_fmod.cpp b/linden/indra/llaudio/audioengine_fmod.cpp index 0e8ea67..2e8f45f 100644 --- a/linden/indra/llaudio/audioengine_fmod.cpp +++ b/linden/indra/llaudio/audioengine_fmod.cpp | |||
@@ -491,16 +491,17 @@ BOOL LLAudioChannelFMOD::updateBuffer() | |||
491 | // If we have a source for the channel, we need to update its gain. | 491 | // If we have a source for the channel, we need to update its gain. |
492 | if (mCurrentSourcep) | 492 | if (mCurrentSourcep) |
493 | { | 493 | { |
494 | // SJB: warnings can spam and hurt framerate, disabling | ||
494 | if (!FSOUND_SetVolume(mChannelID, llround(mCurrentSourcep->getGain() * 255.0f))) | 495 | if (!FSOUND_SetVolume(mChannelID, llround(mCurrentSourcep->getGain() * 255.0f))) |
495 | { | 496 | { |
496 | llwarns << "LLAudioChannelFMOD::updateBuffer error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl; | 497 | // llwarns << "LLAudioChannelFMOD::updateBuffer error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl; |
497 | } | 498 | } |
498 | 499 | ||
499 | if (!FSOUND_SetLoopMode(mChannelID, mCurrentSourcep->isLoop() ? FSOUND_LOOP_NORMAL : FSOUND_LOOP_OFF)) | 500 | if (!FSOUND_SetLoopMode(mChannelID, mCurrentSourcep->isLoop() ? FSOUND_LOOP_NORMAL : FSOUND_LOOP_OFF)) |
500 | { | 501 | { |
501 | llwarns << "Channel " << mChannelID << llendl; | 502 | // llwarns << "Channel " << mChannelID << "Source ID: " << mCurrentSourcep->getID() |
502 | llwarns << "Source ID: " << mCurrentSourcep->getID() << " at " << mCurrentSourcep->getPositionGlobal() << llendl; | 503 | // << " at " << mCurrentSourcep->getPositionGlobal() << llendl; |
503 | llwarns << "LLAudioChannelFMOD::updateBuffer error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl; | 504 | // llwarns << "LLAudioChannelFMOD::updateBuffer error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl; |
504 | } | 505 | } |
505 | } | 506 | } |
506 | 507 | ||
@@ -686,7 +687,7 @@ BOOL LLAudioBufferFMOD::loadWAV(const char *filename) | |||
686 | // MikeS. - Loading the sound file manually and then handing it over to FMOD, | 687 | // MikeS. - Loading the sound file manually and then handing it over to FMOD, |
687 | // since FMOD uses posix IO internally, | 688 | // since FMOD uses posix IO internally, |
688 | // which doesn't work with unicode file paths. | 689 | // which doesn't work with unicode file paths. |
689 | FILE* sound_file = LLFile::fopen(filename,"rb"); | 690 | FILE* sound_file = LLFile::fopen(filename,"rb"); /* Flawfinder: ignore */ |
690 | if (sound_file) | 691 | if (sound_file) |
691 | { | 692 | { |
692 | fseek(sound_file,0,SEEK_END); | 693 | fseek(sound_file,0,SEEK_END); |