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

summaryrefslogtreecommitdiff
path: root/source/frontend/StarMainMixer.cpp
diff options
context:
space:
mode:
authorBottinator22 <bottinator22@gmail.com>2024-01-02 23:08:51 -0800
committerBottinator22 <bottinator22@gmail.com>2024-01-02 23:08:51 -0800
commit91cf2d82515583d7627ce3fd452f81e345918144 (patch)
tree6d9ea19b3e910ba7e5bb1f2c4bfc9dd2c4dcd516 /source/frontend/StarMainMixer.cpp
parent9e605b182da26bd9fc2f28805d5f08c6764e47a3 (diff)
Add fork changes (move instruments to their own audio group)
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);