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

Properly advertise Sequencer tempo to voice SoundMacros

Browse Source
This commit is contained in:
Jack Andersen
2016-06-01 11:32:48 -10:00
parent a047b1f6c8
commit e932539ec4
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/SoundMacroState.cpp
View File

@@ -216,7 +216,7 @@ bool SoundMacroState::advance(Voice& vox, double dt)
m_pc.back().second = macroStep;
else
vox.loadSoundObject(macroId, macroStep, m_ticksPerSec,
m_initKey, m_initVel, m_initMod);
m_initKey, m_initVel, m_initMod);
}
break;
@@ -300,7 +300,7 @@ bool SoundMacroState::advance(Voice& vox, double dt)
m_pc.back().second = macroStep;
else
vox.loadSoundObject(macroId, macroStep, m_ticksPerSec,
m_initKey, m_initVel, m_initMod);
m_initKey, m_initVel, m_initMod);
break;
}
@@ -389,7 +389,7 @@ bool SoundMacroState::advance(Voice& vox, double dt)
m_pc.back().second = macroStep;
else
vox.loadSoundObject(macroId, macroStep, m_ticksPerSec,
m_initKey, m_initVel, m_initMod);
m_initKey, m_initVel, m_initMod);
}
break;
@@ -512,7 +512,7 @@ bool SoundMacroState::advance(Voice& vox, double dt)
m_pc.back().second = macroStep;
else
vox.loadSoundObject(macroId, macroStep, m_ticksPerSec,
m_initKey, m_initVel, m_initMod);
m_initKey, m_initVel, m_initMod);
}
break;
@@ -769,7 +769,7 @@ bool SoundMacroState::advance(Voice& vox, double dt)
m_pc.push_back({m_pc.back().first, macroStep});
else
vox.loadSoundObject(macroId, macroStep, m_ticksPerSec,
m_initKey, m_initVel, m_initMod, true);
m_initKey, m_initVel, m_initMod, true);
m_header = *reinterpret_cast<const Header*>(m_pc.back().first);
if (vox.getAudioGroup().getDataFormat() != DataFormat::PC)