From db390f8d7f20d392d4f99e9623d55627f9b9d4fe Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 3 May 2023 20:46:02 -0400
Subject: [PATCH] Fox
---
indra/llaudio/llaudioengine_fmodstudio.cpp | 14 +++++++-------
indra/llaudio/llaudioengine_fmodstudio.h | 1 -
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/indra/llaudio/llaudioengine_fmodstudio.cpp b/indra/llaudio/llaudioengine_fmodstudio.cpp
index 1db94750b0b..f5003ce2390 100644
--- a/indra/llaudio/llaudioengine_fmodstudio.cpp
+++ b/indra/llaudio/llaudioengine_fmodstudio.cpp
@@ -86,12 +86,12 @@ bool LLAudioEngine_FMODSTUDIO::init(void* userdata, const std::string &app_title
if (version < FMOD_VERSION)
{
- LL_WARNS("AppInit") << "Error : You are using the wrong FMOD Studio version (" << version
- << ")! You should be using FMOD Studio" << FMOD_VERSION << LL_ENDL;
+ LL_WARNS("AppInit") << "FMOD Studio version mismatch, actual: " << version
+ << " expected:" << FMOD_VERSION << LL_ENDL;
}
// In this case, all sounds, PLUS wind and stream will be software.
- result = mSystem->setSoftwareChannels(LL_MAX_AUDIO_CHANNELS + 2);
+ result = mSystem->setSoftwareChannels(LL_MAX_AUDIO_CHANNELS + EXTRA_SOUND_CHANNELS);
Check_FMOD_Error(result,"FMOD::System::setSoftwareChannels");
FMOD_ADVANCEDSETTINGS adv_settings = { };
@@ -130,7 +130,7 @@ bool LLAudioEngine_FMODSTUDIO::init(void* userdata, const std::string &app_title
{
LL_DEBUGS("AppInit") << "Trying PulseAudio audio output..." << LL_ENDL;
if((result = mSystem->setOutput(FMOD_OUTPUTTYPE_PULSEAUDIO)) == FMOD_OK &&
- (result = mSystem->init(LL_MAX_AUDIO_CHANNELS + 2, fmod_flags, const_cast<char*>(app_title.c_str()))) == FMOD_OK)
+ (result = mSystem->init(LL_MAX_AUDIO_CHANNELS + EXTRA_SOUND_CHANNELS, fmod_flags, const_cast<char*>(app_title.c_str()))) == FMOD_OK)
{
LL_DEBUGS("AppInit") << "PulseAudio output initialized OKAY" << LL_ENDL;
audio_ok = true;
@@ -151,7 +151,7 @@ bool LLAudioEngine_FMODSTUDIO::init(void* userdata, const std::string &app_title
{
LL_DEBUGS("AppInit") << "Trying ALSA audio output..." << LL_ENDL;
if((result = mSystem->setOutput(FMOD_OUTPUTTYPE_ALSA)) == FMOD_OK &&
- (result = mSystem->init(LL_MAX_AUDIO_CHANNELS + 2, fmod_flags, 0)) == FMOD_OK)
+ (result = mSystem->init(LL_MAX_AUDIO_CHANNELS + EXTRA_SOUND_CHANNELS, fmod_flags, 0)) == FMOD_OK)
{
LL_DEBUGS("AppInit") << "ALSA audio output initialized OKAY" << LL_ENDL;
audio_ok = true;
@@ -192,7 +192,7 @@ bool LLAudioEngine_FMODSTUDIO::init(void* userdata, const std::string &app_title
#else // LL_LINUX
// initialize the FMOD engine
- result = mSystem->init(LL_MAX_AUDIO_CHANNELS + 2, fmod_flags, 0);
+ result = mSystem->init(LL_MAX_AUDIO_CHANNELS + EXTRA_SOUND_CHANNELS, fmod_flags, 0);
if (Check_FMOD_Error(result, "Error initializing FMOD Studio with default settins, retrying with other format"))
{
result = mSystem->setSoftwareFormat(44100, FMOD_SPEAKERMODE_STEREO, 0/*- ignore*/);
@@ -200,7 +200,7 @@ bool LLAudioEngine_FMODSTUDIO::init(void* userdata, const std::string &app_title
{
return false;
}
- result = mSystem->init(LL_MAX_AUDIO_CHANNELS + 2, fmod_flags, 0);
+ result = mSystem->init(LL_MAX_AUDIO_CHANNELS + EXTRA_SOUND_CHANNELS, fmod_flags, 0);
}
if (Check_FMOD_Error(result, "Error initializing FMOD Studio"))
{
diff --git a/indra/llaudio/llaudioengine_fmodstudio.h b/indra/llaudio/llaudioengine_fmodstudio.h
index 89a58d3346b..0893ab725fa 100644
--- a/indra/llaudio/llaudioengine_fmodstudio.h
+++ b/indra/llaudio/llaudioengine_fmodstudio.h
@@ -86,7 +86,6 @@ class LLAudioEngine_FMODSTUDIO final : public LLAudioEngine
FMOD::System *mSystem;
bool mEnableProfiler;
U32 mResampleMethod;
- std::string mAppName;
public:
static FMOD::ChannelGroup *mChannelGroups[LLAudioEngine::AUDIO_TYPE_COUNT];
--
GitLab