sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure to generate continuous modulations

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-11-15 18:24:26 +01:00
parent f06ed50c57
commit 555356528b
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/sfizz/LFO.cpp
View file

@ -330,16 +330,22 @@ void LFO::generatePhase(unsigned nth, absl::Span<float> phases, NumericId<Region
// TODO(jpc) lfoN_count: number of repetitions // TODO(jpc) lfoN_count: number of repetitions
// modulations
const float* beatsMod = nullptr;
const float* freqMod = nullptr;
if (modMatrix && id && regionId) {
// Note(jpc) we might switch between beats and frequency, if host
// switches play state on and off; continually generate both.
ModKey beatsKey = ModKey::createNXYZ(ModId::LFOBeats, regionId, id.number());
ModKey freqKey = ModKey::createNXYZ(ModId::LFOFrequency, regionId, id.number());
beatsMod = modMatrix->getModulationByKey(beatsKey);
freqMod = modMatrix->getModulationByKey(freqKey);
}
if (beatClock && beatClock->isPlaying() && beats > 0) { if (beatClock && beatClock->isPlaying() && beats > 0) {
// generate using the beat clock // generate using the beat clock
float beatRatio = (ratio > 0) ? (1.0f / ratio) : 0.0f; float beatRatio = (ratio > 0) ? (1.0f / ratio) : 0.0f;
const float* beatsMod = nullptr;
if (modMatrix && id && regionId) {
ModKey beatsKey = ModKey::createNXYZ(ModId::LFOBeats, regionId, id.number());
beatsMod = modMatrix->getModulationByKey(beatsKey);
}
if (!beatsMod) if (!beatsMod)
beatClock->calculatePhase(beats * beatRatio, phases.data()); beatClock->calculatePhase(beats * beatRatio, phases.data());
else { else {
@ -358,12 +364,6 @@ void LFO::generatePhase(unsigned nth, absl::Span<float> phases, NumericId<Region
} }
else { else {
// generate using the frequency // generate using the frequency
const float* freqMod = nullptr;
if (modMatrix && id && regionId) {
ModKey freqKey = ModKey::createNXYZ(ModId::LFOFrequency, regionId, id.number());
freqMod = modMatrix->getModulationByKey(freqKey);
}
if (!freqMod) { if (!freqMod) {
for (size_t i = 0; i < numFrames; ++i) { for (size_t i = 0; i < numFrames; ++i) {
phases[i] = phase; phases[i] = phase;