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

Allow oscillator frequency to be modulated into negatives

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-09-23 01:09:37 +02:00
parent a587b4035b
commit e19c20e90e
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/sfizz/Wavetables.cpp
View file

@ -36,6 +36,14 @@ void WavetableOscillator::setPhase(float phase)
_phase = phase;
}
static float incrementAndWrap(float phase, float inc)
{
phase += inc;
phase -= static_cast<int>(phase);
phase += phase < 0.0f; // in case of negative frequencies
return phase;
}
template <InterpolatorModel M>
void WavetableOscillator::processSingle(float frequency, float detuneRatio, float* output, unsigned nframes)
{
@ -52,8 +60,7 @@ void WavetableOscillator::processSingle(float frequency, float detuneRatio, floa
float frac = position - index;
output[i] = interpolate<M>(&table[index], frac);
phase += phaseInc;
phase -= static_cast<int>(phase);
phase = incrementAndWrap(phase, phaseInc);
}
_phase = phase;
@ -78,8 +85,7 @@ void WavetableOscillator::processModulatedSingle(const float* frequencies, const
float frac = position - index;
output[i] = interpolate<M>(&table[index], frac);
phase += phaseInc;
phase -= static_cast<int>(phase);
phase = incrementAndWrap(phase, phaseInc);
}
_phase = phase;
@ -103,8 +109,7 @@ void WavetableOscillator::processDual(float frequency, float detuneRatio, float*
(1 - dt.delta) * interpolate<M>(&dt.table1[index], frac) +
dt.delta * interpolate<M>(&dt.table2[index], frac);
phase += phaseInc;
phase -= static_cast<int>(phase);
phase = incrementAndWrap(phase, phaseInc);
}
_phase = phase;
@ -132,8 +137,7 @@ void WavetableOscillator::processModulatedDual(const float* frequencies, const f
(1 - dt.delta) * interpolate<M>(&dt.table1[index], frac) +
dt.delta * interpolate<M>(&dt.table2[index], frac);
phase += phaseInc;
phase -= static_cast<int>(phase);
phase = incrementAndWrap(phase, phaseInc);
}
_phase = phase;