diff options
| author | Bottinator22 <bottinator22@gmail.com> | 2024-01-02 23:08:51 -0800 |
|---|---|---|
| committer | Bottinator22 <bottinator22@gmail.com> | 2024-01-02 23:08:51 -0800 |
| commit | 91cf2d82515583d7627ce3fd452f81e345918144 (patch) | |
| tree | 6d9ea19b3e910ba7e5bb1f2c4bfc9dd2c4dcd516 /source/base | |
| parent | 9e605b182da26bd9fc2f28805d5f08c6764e47a3 (diff) | |
Add fork changes (move instruments to their own audio group)
Diffstat (limited to 'source/base')
| -rw-r--r-- | source/base/StarMixer.cpp | 3 | ||||
| -rw-r--r-- | source/base/StarMixer.hpp | 3 |
2 files changed, 4 insertions, 2 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) diff --git a/source/base/StarMixer.hpp b/source/base/StarMixer.hpp index f87f5be..b71a2f1 100644 --- a/source/base/StarMixer.hpp +++ b/source/base/StarMixer.hpp @@ -23,7 +23,8 @@ struct RampedValue { enum class MixerGroup : uint8_t { Effects, Music, - Cinematic + Cinematic, + Instruments }; class AudioInstance { |