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

Minor clean up for oscillator initialization

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-06-22 21:58:34 +02:00
parent 3cd56b4697
commit 06595c0ae6
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/sfizz/Voice.cpp
View file

@ -65,19 +65,21 @@ void sfz::Voice::startVoice(Region* region, int delay, int number, float value,
wave = resources.wavePool.getWaveSaw(); wave = resources.wavePool.getWaveSaw();
break; break;
} }
const int quality = region->oscillatorQuality ? *region->oscillatorQuality : Default::oscillatorQuality; const float phase = region->getPhase();
const int quality = region->oscillatorQuality.value_or(Default::oscillatorQuality);
for (WavetableOscillator& osc : waveOscillators) { for (WavetableOscillator& osc : waveOscillators) {
osc.setWavetable(wave); osc.setWavetable(wave);
osc.setPhase(region->getPhase()); osc.setPhase(phase);
osc.setQuality(quality); osc.setQuality(quality);
} }
setupOscillatorUnison(); setupOscillatorUnison();
} else if (region->oscillator) { } else if (region->oscillator) {
const WavetableMulti* wave = resources.wavePool.getFileWave(region->sampleId.filename()); const WavetableMulti* wave = resources.wavePool.getFileWave(region->sampleId.filename());
const int quality = region->oscillatorQuality ? *region->oscillatorQuality : Default::oscillatorQuality; const float phase = region->getPhase();
const int quality = region->oscillatorQuality.value_or(Default::oscillatorQuality);
for (WavetableOscillator& osc : waveOscillators) { for (WavetableOscillator& osc : waveOscillators) {
osc.setWavetable(wave); osc.setWavetable(wave);
osc.setPhase(region->getPhase()); osc.setPhase(phase);
osc.setQuality(quality); osc.setQuality(quality);
} }
setupOscillatorUnison(); setupOscillatorUnison();