Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/frontend/StarMainMixer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/frontend/StarMainMixer.cpp')
-rw-r--r--source/frontend/StarMainMixer.cpp5
1 files changed, 5 insertions, 0 deletions
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);