hacklab/strudel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify vibrato logic

Browse source
This commit is contained in:
Felix Roos 2023-09-17 10:15:33 +02:00
parent 5c5df74860
commit c354ee32e3
1 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

39
packages/superdough/synth.mjs
View file

@ -147,12 +147,6 @@ export function waveformN(partials, type) {
} }
export function getOscillator({ s, freq, t, vib, vibmod, partials }) { export function getOscillator({ s, freq, t, vib, vibmod, partials }) {
// Additional oscillator for vibrato effect
if (vib > 0) {
var vibrato_oscillator = getAudioContext().createOscillator();
vibrato_oscillator.frequency.value = vib;
}
// Make oscillator with partial count // Make oscillator with partial count
let o; let o;
if (!partials || s === 'sine') { if (!partials || s === 'sine') {
@ -161,28 +155,27 @@ export function getOscillator({ s, freq, t, vib, vibmod, partials }) {
} else { } else {
o = waveformN(partials, s); o = waveformN(partials, s);
} }
o.frequency.value = Number(freq);
o.start(t);
// Additional oscillator for vibrato effect
let vibrato_oscillator;
if (vib > 0) { if (vib > 0) {
o.frequency.value = Number(freq); vibrato_oscillator = getAudioContext().createOscillator();
var gain = getAudioContext().createGain(); vibrato_oscillator.frequency.value = vib;
const gain = getAudioContext().createGain();
// Vibmod is the amount of vibrato, in semitones // Vibmod is the amount of vibrato, in semitones
gain.gain.value = vibmod * freq; gain.gain.value = vibmod * 100;
vibrato_oscillator.connect(gain); vibrato_oscillator.connect(gain);
gain.connect(o.detune); gain.connect(o.detune);
vibrato_oscillator.start(t); vibrato_oscillator.start(t);
o.start(t);
return {
node: o,
stop: (time) => {
vibrato_oscillator.stop(time);
o.stop(time);
},
};
} else {
// Normal operation, without vibrato
o.frequency.value = Number(freq);
o.start(t);
const stop = (time) => o.stop(time);
return { node: o, stop };
} }
return {
node: o,
stop: (time) => {
vibrato_oscillator?.stop(time);
o.stop(time);
},
};
} }