From 91cf2d82515583d7627ce3fd452f81e345918144 Mon Sep 17 00:00:00 2001 From: Bottinator22 Date: Tue, 2 Jan 2024 23:08:51 -0800 Subject: Add fork changes (move instruments to their own audio group) --- source/frontend/StarMainMixer.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source/frontend/StarMainMixer.cpp') diff --git a/source/frontend/StarMainMixer.cpp b/source/frontend/StarMainMixer.cpp index 219daa2..16fb736 100644 --- a/source/frontend/StarMainMixer.cpp +++ b/source/frontend/StarMainMixer.cpp @@ -47,6 +47,7 @@ void MainMixer::update(float dt, bool muteSfx, bool muteMusic) { updateGroupVolume(MixerGroup::Effects, muteSfx, "sfxVol"); updateGroupVolume(MixerGroup::Music, muteMusic, "musicVol"); updateGroupVolume(MixerGroup::Cinematic, false, "sfxVol"); + updateGroupVolume(MixerGroup::Instruments, muteSfx, "instrumentVol"); WorldClientPtr currentWorld; if (m_universeClient) @@ -57,6 +58,10 @@ void MainMixer::update(float dt, bool muteSfx, bool muteMusic) { audioInstance->setMixerGroup(MixerGroup::Effects); m_mixer->play(audioInstance); } + for (auto audioInstance : currentWorld->pullPendingInstrumentAudio()) { + audioInstance->setMixerGroup(MixerGroup::Instruments); + m_mixer->play(audioInstance); + } for (auto audioInstance : currentWorld->pullPendingMusic()) { audioInstance->setMixerGroup(MixerGroup::Music); m_mixer->play(audioInstance); -- cgit v1.2.3