summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon/Mixer.cpp
diff options
context:
space:
mode:
authorJMC47 <JMC4789@gmail.com>2026-11-01 14:59:17 -0500
committerGitHub <noreply@github.com>2026-11-01 14:59:17 -0500
commite6ed14488a84eeaae1856e1d7c0dd457dceb49ce (patch)
tree5a28fce2c3406e18be4dc19a4734db92c736aa29 /Source/Core/AudioCommon/Mixer.cpp
parent86d554802d7560acf12b5c5a2b3acb344069b5ce (diff)
parentbaa05e32f1db379e98bbd48b35b2aaa2e6fa4e94 (diff)
Merge pull request #14006 from jordan-woyak/speaker-accuracy
HW/Wiimote: Speaker logic accuracy fixes, comments, and code cleanups.
Diffstat (limited to 'Source/Core/AudioCommon/Mixer.cpp')
-rw-r--r--Source/Core/AudioCommon/Mixer.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp
index e27fb3c488..59d81892d5 100644
--- a/Source/Core/AudioCommon/Mixer.cpp
+++ b/Source/Core/AudioCommon/Mixer.cpp
@@ -269,6 +269,9 @@ void Mixer::PushWiimoteSpeakerSamples(std::size_t wiimote_index, const s16* samp
if (!IsOutputSampleRateValid() || wiimote_index >= m_wiimote_speaker_mixers.size())
return;
+ if (!m_config_wiimote_enable_speaker)
+ return;
+
// WiimoteEmu produces host-endian mono samples.
m_wiimote_speaker_mixers[wiimote_index].SetInputSampleRateDivisor(sample_rate_divisor);
@@ -467,6 +470,7 @@ void Mixer::RefreshConfig()
m_config_gba_routing_enabled = Config::Get(Config::MAIN_GBA_AUDIO_ROUTING_ENABLED);
for (std::size_t i = 0; i < m_config_gba_output_enabled.size(); ++i)
m_config_gba_output_enabled[i] = Config::Get(Config::MAIN_GBA_AUDIO_OUTPUT_ENABLED[i]);
+ m_config_wiimote_enable_speaker = Config::Get(Config::MAIN_WIIMOTE_ENABLE_SPEAKER);
}
void Mixer::MixerFifo::DoState(PointerWrap& p)