Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding vibrato to Superdough sampler #706

Merged
merged 6 commits into from
Nov 9, 2023
Merged

Adding vibrato to Superdough sampler #706

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
08aab9d
Adding vibrato to Superdough sampler
Bubobubobubobubo Sep 20, 2023
5aac042
Merge branch 'main' into global-vibrato
felixroos Nov 9, 2023
8583508
format
felixroos Nov 9, 2023
7c8a8b8
simplify
felixroos Nov 9, 2023
0052d34
refactor: move vibrato up + cleanup oscillator
felixroos Nov 9, 2023
2a09f9e
fix: sampler broke without vibrato
felixroos Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion packages/superdough/sampler.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ export const getSampleBufferSource = async (s, n, note, speed, freq, bank, resol
const bufferSource = ac.createBufferSource();
bufferSource.buffer = buffer;
const playbackRate = 1.0 * Math.pow(2, transpose / 12);
// bufferSource.playbackRate.value = Math.pow(2, transpose / 12);
bufferSource.playbackRate.value = playbackRate;
return bufferSource;
};
Expand Down Expand Up @@ -240,6 +239,8 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
begin = 0,
loopEnd = 1,
end = 1,
vib,
vibmod = 0.5,
} = value;
// load sample
if (speed === 0) {
Expand All @@ -255,6 +256,19 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {

const bufferSource = await getSampleBufferSource(s, n, note, speed, freq, bank, resolveUrl);

// vibrato
let vibratoOscillator;
if (vib > 0) {
vibratoOscillator = getAudioContext().createOscillator();
vibratoOscillator.frequency.value = vib;
const gain = getAudioContext().createGain();
// Vibmod is the amount of vibrato, in semitones
gain.gain.value = vibmod * 100;
vibratoOscillator.connect(gain);
gain.connect(bufferSource.detune);
vibratoOscillator.start(0);
}

// asny stuff above took too long?
if (ac.currentTime > t) {
logger(`[sampler] still loading sound "${s}:${n}"`, 'highlight');
Expand Down Expand Up @@ -286,6 +300,7 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
envelope.connect(out);
bufferSource.onended = function () {
bufferSource.disconnect();
vibratoOscillator?.stop();
envelope.disconnect();
out.disconnect();
onended();
Expand Down
Loading