From 5c1c3604b6d6745ff702f536314ff8ab1ec8e7a6 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 9 Jan 2018 23:15:13 +0100 Subject: [PATCH] Somehow this got mangled up... --- indra/llaudio/llaudioengine_fmodstudio.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/indra/llaudio/llaudioengine_fmodstudio.cpp b/indra/llaudio/llaudioengine_fmodstudio.cpp index 9d7b0509ac..e55485bb02 100644 --- a/indra/llaudio/llaudioengine_fmodstudio.cpp +++ b/indra/llaudio/llaudioengine_fmodstudio.cpp @@ -126,9 +126,8 @@ bool LLAudioEngine_FMODSTUDIO::init(const S32 num_channels, void* userdata) break; } - // In this case, all sounds, PLUS wind and stream will be software. - result = mSystem->setSoftwareChannels(num_channels + 2); - Check_FMOD_Error(result,"FMOD::System::setSoftwareChannels"); + result = mSystem->setAdvancedSettings(&adv_settings); + Check_FMOD_Error(result, "FMOD::System::setAdvancedSettings"); U32 fmod_flags = FMOD_INIT_NORMAL | FMOD_INIT_3D_RIGHTHANDED | FMOD_INIT_THREAD_UNSAFE; if(mEnableProfiler) @@ -239,6 +238,11 @@ bool LLAudioEngine_FMODSTUDIO::init(const S32 num_channels, void* userdata) LL_INFOS("AppInit") << "LLAudioEngine_FMODSTUDIO::init() FMOD Studio initialized correctly" << LL_ENDL; + FMOD_ADVANCEDSETTINGS adv_settings_dump = { }; + mSystem->getAdvancedSettings(&adv_settings_dump); + + LL_INFOS("AppInit") << "LLAudioEngine_FMODSTUDIO::init(): resampler=" << adv_settings.resamplerMethod << " bytes" << LL_ENDL; + int r_numbuffers, r_samplerate, r_channels; unsigned int r_bufferlength; mSystem->getDSPBufferSize(&r_bufferlength, &r_numbuffers);