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

summaryrefslogtreecommitdiff
path: root/source/base/StarMixer.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/base/StarMixer.cpp
parent9e605b182da26bd9fc2f28805d5f08c6764e47a3 (diff)
Add fork changes (move instruments to their own audio group)
Diffstat (limited to 'source/base/StarMixer.cpp')
-rw-r--r--source/base/StarMixer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/base/StarMixer.cpp b/source/base/StarMixer.cpp
index 2ec6b9e..d3c7c5a 100644
--- a/source/base/StarMixer.cpp
+++ b/source/base/StarMixer.cpp
@@ -172,6 +172,7 @@ Mixer::Mixer(unsigned sampleRate, unsigned channels) {
m_groupVolumes[MixerGroup::Effects] = {1.0f, 1.0f, 0};
m_groupVolumes[MixerGroup::Music] = {1.0f, 1.0f, 0};
m_groupVolumes[MixerGroup::Cinematic] = {1.0f, 1.0f, 0};
+ m_groupVolumes[MixerGroup::Instruments] = {1.0f, 1.0f, 0};
m_speed = 1.0f;
}
@@ -296,7 +297,7 @@ void Mixer::read(int16_t* outBuffer, size_t frameCount, ExtraMixFunction extraMi
? approach(audioInstance->m_pitchMultiplierTarget, audioInstance->m_pitchMultiplier, audioInstance->m_pitchMultiplierVelocity * time)
: audioInstance->m_pitchMultiplier;
- if (audioInstance->m_mixerGroup == MixerGroup::Effects)
+ if (audioInstance->m_mixerGroup == MixerGroup::Effects || audioInstance->m_mixerGroup == MixerGroup::Instruments)
pitchMultiplier *= speed;
if (audioStopVolEnd == 0.0f && audioInstance->m_stopping)