AxioDL
/
amuse
mirror of https://github.com/AxioDL/amuse.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure mod wheel value is used in respective vibrato mode

This commit is contained in:
Jack Andersen 2018-06-21 11:03:35 -10:00
parent d7011f0e77
commit 1e8ce19b16
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Voice.cpp
View File

@ -454,7 +454,7 @@ void Voice::preSupplyAudio(double dt)
m_vibratoTime += dt; m_vibratoTime += dt;
float vibrato = std::sin(m_vibratoTime / m_vibratoPeriod * (2.f * M_PIF)); float vibrato = std::sin(m_vibratoTime / m_vibratoPeriod * (2.f * M_PIF));
if (m_vibratoModWheel) if (m_vibratoModWheel)
newPitch += m_vibratoModLevel * vibrato; newPitch += m_vibratoModLevel * vibrato * (m_state.m_curMod / 127.f);
else else
newPitch += m_vibratoLevel * vibrato; newPitch += m_vibratoLevel * vibrato;
refresh = true; refresh = true;
@ -1404,6 +1404,10 @@ void Voice::_notifyCtrlChange(uint8_t ctrl, int8_t val)
{ {
setAuxBVol(val / 127.f); setAuxBVol(val / 127.f);
} }
else if (ctrl == 0x1)
{
m_state.m_curMod = uint8_t(val);
}
for (std::shared_ptr<Voice>& vox : m_childVoices) for (std::shared_ptr<Voice>& vox : m_childVoices)
vox->_notifyCtrlChange(ctrl, val); vox->_notifyCtrlChange(ctrl, val);