elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-26 04:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

trying to fix divergent firefox behavior

Browse Source
This commit is contained in:
Jade (Rose) Rowland 2023-12-20 01:44:34 -05:00
parent 34ba81a841
commit f6d9ad51c6
2 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
packages/superdough/helpers.mjs
View File

@ -1,28 +1,25 @@
import { getAudioContext } from './superdough.mjs'; import { getAudioContext } from './superdough.mjs';
import { clamp } from './util.mjs'; import { clamp } from './util.mjs';
if (AudioParam != null) { const setRelease = (param, startTime, endTime, endValue, curve = 'linear') => {
AudioParam.prototype.setRelease = function (startTime, endTime, endValue, curve = 'linear') { const ctx = getAudioContext();
const ctx = getAudioContext(); const ramp = curve === 'exponential' ? 'exponentialRampToValueAtTime' : 'linearRampToValueAtTime';
const ramp = curve === 'exponential' ? 'exponentialRampToValueAtTime' : 'linearRampToValueAtTime'; if (param.cancelAndHoldAtTime == null) {
const param = this; //this replicates cancelAndHoldAtTime behavior for Firefox
if (AudioParam.prototype.cancelAndHoldAtTime == null) { setTimeout(() => {
//this replicates cancelAndHoldAtTime behavior for Firefox //sustain at current value
setTimeout(() => { const currValue = param.value;
//sustain at current value param.cancelScheduledValues(0);
const currValue = param.value; param.setValueAtTime(currValue, 0);
param.cancelScheduledValues(0);
param.setValueAtTime(currValue, 0);
//release
param[ramp](endValue, endTime);
}, (startTime - ctx.currentTime) * 1000);
} else {
param.cancelAndHoldAtTime(startTime);
//release //release
param[ramp](endValue, endTime); param[ramp](endValue, endTime);
} }, (startTime - ctx.currentTime) * 1000);
}; } else {
} param.cancelAndHoldAtTime(startTime);
//release
param[ramp](endValue, endTime);
}
};
export function gainNode(value) { export function gainNode(value) {
const node = getAudioContext().createGain(); const node = getAudioContext().createGain();
@ -45,9 +42,9 @@ export const getEnvelope = (attack, decay, sustain, release, velocity, begin) =>
node: gainNode, node: gainNode,
stop: (t) => { stop: (t) => {
const endTime = t + release; const endTime = t + release;
gainNode.gain.setRelease(t, endTime, 0); setRelease(gainNode.gain, t, endTime, 0);
// helps prevent pops from overlapping sounds // helps prevent pops from overlapping sounds
return endTime - 0.01; return endTime;
}, },
}; };
}; };
@ -117,8 +114,8 @@ export const getParamADSR = (
const sustainLevel = min + sustain * range; const sustainLevel = min + sustain * range;
//decay //decay
param[ramp](sustainLevel, phase); param[ramp](sustainLevel, phase);
phase += Math.max(release, 0.1); phase += release;
param.setRelease(end, phase, min, curve); setRelease(param, end, phase, min, curve);
}; };
export function getCompressor(ac, threshold, ratio, knee, attack, release) { export function getCompressor(ac, threshold, ratio, knee, attack, release) {
@ -135,19 +132,20 @@ export function getCompressor(ac, threshold, ratio, knee, attack, release) {
// changes the default values of the envelope based on what parameters the user has defined // changes the default values of the envelope based on what parameters the user has defined
// so it behaves more like you would expect/familiar as other synthesis tools // so it behaves more like you would expect/familiar as other synthesis tools
// ex: sound(val).decay(val) will behave as a decay only envelope. sound(val).attack(val).decay(val) will behave like an "ad" env, etc. // ex: sound(val).decay(val) will behave as a decay only envelope. sound(val).attack(val).decay(val) will behave like an "ad" env, etc.
const envmin = 0.001;
export const getADSRValues = (params, defaultValues = [envmin, envmin, 1, envmin]) => { export const getADSRValues = (params, defaultValues, min = 0, max = 1) => {
defaultValues = defaultValues ?? [min, min, max, min];
const [a, d, s, r] = params; const [a, d, s, r] = params;
const [defA, defD, defS, defR] = defaultValues; const [defA, defD, defS, defR] = defaultValues;
if (a == null && d == null && s == null && r == null) { if (a == null && d == null && s == null && r == null) {
return defaultValues; return defaultValues;
} }
const sustain = s != null ? s : (a != null && d == null) || (a == null && d == null) ? defS : envmin; const sustain = s != null ? s : (a != null && d == null) || (a == null && d == null) ? max : min;
return [a ?? envmin, d ?? envmin, sustain, r ?? envmin]; return [a ?? min, d ?? min, sustain, r ?? min];
}; };
export function createFilter(context, type, frequency, Q, att, dec, sus, rel, fenv, start, end, fanchor = 0.5) { export function createFilter(context, type, frequency, Q, att, dec, sus, rel, fenv, start, end, fanchor = 0.5) {
const [attack, decay, sustain, release] = getADSRValues([att, dec, sus, rel], [0.01, 0.01, 1, 0.01]); const [attack, decay, sustain, release] = getADSRValues([att, dec, sus, rel], [0.001, 0.1, 1, 0.01], 0.001, 1);
const filter = context.createBiquadFilter(); const filter = context.createBiquadFilter();
filter.type = type; filter.type = type;
filter.Q.value = Q; filter.Q.value = Q;

5
packages/superdough/synth.mjs
View File

@ -29,10 +29,12 @@ export function registerSynthSounds() {
registerSound( registerSound(
s, s,
(t, value, onended) => { (t, value, onended) => {
const defaultADSRValues = [0.001, 0.05, 0.6, 0.01]; const defaultADSRValues = [0.001, 0.1, 0.6, 0.01];
const [attack, decay, sustain, release] = getADSRValues( const [attack, decay, sustain, release] = getADSRValues(
[value.attack, value.decay, value.sustain, value.release], [value.attack, value.decay, value.sustain, value.release],
defaultADSRValues, defaultADSRValues,
0,
0.6,
); );
let sound; let sound;
@ -42,7 +44,6 @@ export function registerSynthSounds() {
let { density } = value; let { density } = value;
sound = getNoiseOscillator(s, t, density); sound = getNoiseOscillator(s, t, density);
} }
console.log(sound);
let { node: o, stop, triggerRelease } = sound; let { node: o, stop, triggerRelease } = sound;
// turn down // turn down