AxioDL/amuse
2
0
Fork 0
mirror of https://github.com/AxioDL/amuse.git synced 2025-12-08 21:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Working SongGroup player, DLS envelopes

Browse Source
This commit is contained in:
Jack Andersen
2016-05-16 10:20:29 -10:00
parent 44bb7a155b
commit e9213ab179
12 changed files with 371 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/SoundMacroState.cpp
View File

@@ -405,7 +405,8 @@ bool SoundMacroState::advance(Voice& vox, double dt)
case Op::SetAdsr:
{
ObjectId tableId = *reinterpret_cast<ObjectId*>(&cmd.m_data[0]);
vox.setAdsr(tableId);
bool dlsMode = cmd.m_data[2];
vox.setAdsr(tableId, dlsMode);
break;
}
case Op::ScaleVolume:
@@ -423,12 +424,12 @@ bool SoundMacroState::advance(Voice& vox, double dt)
const Curve* curveData = vox.getAudioGroup().getPool().tableAsCurves(curve);
if (curveData)
{
vox.setVolume((*curveData)[eval] / 127.f);
vox.m_curVol = (*curveData)[eval] / 127.f;
break;
}
}
vox.setVolume(eval / 127.f);
vox.m_curVol = eval / 127.f;
break;
}
case Op::Panning:
@@ -723,7 +724,7 @@ bool SoundMacroState::advance(Voice& vox, double dt)
{
int16_t scale = *reinterpret_cast<int16_t*>(&cmd.m_data[0]);
bool orgVel = cmd.m_data[2];
vox.setVolume(int32_t(orgVel ? m_initVel : m_curVel) * scale / 4096.f / 127.f);
vox.m_curVol = int32_t(orgVel ? m_initVel : m_curVel) * scale / 4096.f / 127.f;
break;
}
case Op::Mod2Vibrange: