Properly handle multiple releases

packages/core/controls.mjs

@@ -1294,8 +1294,6 @@ export const { fanchor } = registerControl('fanchor');
  *
  * @name lprate
  * @param {number | Pattern} rate rate in hertz
- * @example
- * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).lprate("<4 8 2 1>")
  */
 export const { lprate } = registerControl('lprate');
 
@@ -1304,8 +1302,6 @@ export const { lprate } = registerControl('lprate');
  *
  * @name lpsync
  * @param {number | Pattern} rate rate in cycles
- * @example
- * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).lpsync("<4 8 2 1>")
  */
 export const { lpsync } = registerControl('lpsync');
 
@@ -1314,23 +1310,8 @@ export const { lpsync } = registerControl('lpsync');
  *
  * @name lpdepth
  * @param {number | Pattern} depth depth of modulation
- * @example
- * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).lpdepth("<1 .5 1.8 0>")
  */
-
 export const { lpdepth } = registerControl('lpdepth');
-/**
- * Depth of the LFO for the lowpass filter, in HZ
- *
- * @name lpdepthfrequency
- * @synonyms
- * lpdethfreq
- * @param {number | Pattern} depth depth of modulation
- * @example
- * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).lpdepthfrequency("<200 500 100 0>")
- */
-
-export const { lpdepthfrequency } = registerControl('lpdepthfrequency', 'lpdepthfreq');
 
 /**
  * Shape of the LFO for the lowpass filter
@@ -1380,19 +1361,6 @@ export const { bpsync } = registerControl('bpsync');
  */
 export const { bpdepth } = registerControl('bpdepth');
 
-/**
- * Depth of the LFO for the bandpass filter, in HZ
- *
- * @name bpdepthfrequency
- * @synonyms
- * bpdethfreq
- * @param {number | Pattern} depth depth of modulation
- * @example
- * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).bpdepthfrequency("<200 500 100 0>")
- */
-
-export const { bpdepthfrequency } = registerControl('bpdepthfrequency', 'bpdepthfreq');
-
 /**
  * Shape of the LFO for the bandpass filter
  *
@@ -1439,20 +1407,7 @@ export const { hpsync } = registerControl('hpsync');
  * @name hpdepth
  * @param {number | Pattern} depth depth of modulation
  */
-export const { hpdepth, hpdepthfreq } = registerControl('hpdepth');
+export const { hpdepth } = registerControl('hpdepth');
-
-/**
- * Depth of the LFO for the hipass filter, in hz
- *
- * @name hpdepthfrequency
- * @synonyms
- * hpdethfreq
- * @param {number | Pattern} depth depth of modulation
- * @example
- * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).hpdepthfrequency("<200 500 100 0>")
- */
-
-export const { hpdepthfrequency } = registerControl('hpdepthfrequency', 'hpdepthfreq');
 
 /**
  * Shape of the LFO for the highpass filter
@@ -1865,12 +1820,12 @@ export const { nudge } = registerControl('nudge');
  * Sets the default octave of a synth.
  *
  * @name octave
- * @synonyms oct
  * @param {number | Pattern} octave octave number
  * @example
- * n("0,4,7").scale("F:minor").s('supersaw').octave("<0 1 2 3>")
+ * n("0,4,7").s('supersquare').octave("<3 4 5 6>").osc()
+ * @superDirtOnly
  */
-export const { octave, oct } = registerControl('octave', 'oct');
+export const { octave } = registerControl('octave');
 
 // ['ophatdecay'],
 // TODO: example
@@ -1878,7 +1833,6 @@ export const { octave, oct } = registerControl('octave', 'oct');
  * An `orbit` is a global parameter context for patterns. Patterns with the same orbit will share the same global effects.
  *
  * @name orbit
- * @synonyms o
  * @param {number | Pattern} number
  * @example
  * stack(
@@ -1886,7 +1840,7 @@ export const { octave, oct } = registerControl('octave', 'oct');
  *   s("~ sd ~ sd").delay(.5).delaytime(.125).orbit(2)
  * )
  */
-export const { orbit } = registerControl('orbit', 'o');
+export const { orbit } = registerControl('orbit');
 // TODO: what is this? not found in tidal doc Answer: gain is limited to maximum of 2. This allows you to go over that
 export const { overgain } = registerControl('overgain');
 // TODO: what is this? not found in tidal doc. Similar to above, but limited to 1

packages/core/pattern.mjs

@@ -3687,3 +3687,26 @@ Pattern.prototype.phases = function (list) {
 export const phases = (list) => {
   return _ensureListPattern(list).as('phases');
 };
+
+/**
+ * Establishes a signal chain. Can be called in sequence like pat.chain(...).chain(...) and so forth
+ * and/or in a single .chain(..., ..., etc) call. The arguments to `chain` are _patterns_ which each act like
+ * a self-contained pattern and follow the normal [signal chain](https://strudel.cc/learn/effects/).
+ *
+ * If multiple sound generators are present within the chain, they will be mixed in at the location where
+ * they are declared.
+ *
+ * @name chain
+ * @memberof Pattern
+ * @param {Pattern | Pattern[]} patterns Patterns to combine into a single chain
+ * @returns Pattern
+ */
+Pattern.prototype.chain = function (...pats) {
+  pats = pats.map(reify);
+  return this.withValue((v) => (vEff) => {
+    const currChain = v.chain ?? [];
+    return { ...v, chain: currChain.concat(vEff) };
+  }).appLeft(parray(pats));
+};
+
+export const chain = (pats) => pure({}).chain(pats);

packages/core/repl.mjs

@@ -152,9 +152,9 @@ export function repl({
         // allows muting a pattern x with x_ or _x
         return silence;
       }
-      if (id.includes('$')) {
+      if (id === '$') {
         // allows adding anonymous patterns with $:
-        id = `${id}${anonymousIndex}`;
+        id = `$${anonymousIndex}`;
         anonymousIndex++;
       }
       pPatterns[id] = this;
@@ -215,19 +215,8 @@ export function repl({
       let { pattern, meta } = await _evaluate(code, transpiler, transpilerOptions);
       if (Object.keys(pPatterns).length) {
         let patterns = [];
-        let soloActive = false;
         for (const [key, value] of Object.entries(pPatterns)) {
-          // handle soloed patterns ex: S$: s("bd!4")
+          patterns.push(value.withState((state) => state.setControls({ id: key })));
-          const isSolod = key.length > 1 && key.startsWith('S');
-          if (isSolod && soloActive === false) {
-            // first time we see a soloed pattern, clear existing patterns
-            patterns = [];
-            soloActive = true;
-          }
-          if (!soloActive || (soloActive && isSolod)) {
-            const valWithState = value.withState((state) => state.setControls({ id: key }));
-            patterns.push(valWithState);
-          }
         }
         if (eachTransform) {
           // Explicit lambda so only element (not index and array) are passed
@@ -238,8 +227,8 @@ export function repl({
         pattern = eachTransform(pattern);
       }
       if (allTransforms.length) {
-        for (const transform of allTransforms) {
+        for (let i in allTransforms) {
-          pattern = transform(pattern);
+          pattern = allTransforms[i](pattern);
         }
       }
 

packages/core/signal.mjs

@@ -524,7 +524,7 @@ export const wchoose = (...pairs) => wchooseWith(rand, ...pairs);
  * @example
  * wchooseCycles(["bd",10], ["hh",1], ["sd",1]).s().fast(8)
  * @example
- * wchooseCycles(["c c c",5], ["a a a",3], ["f f f",1]).fast(4).note()
+ * wchooseCycles(["bd bd bd",5], ["hh hh hh",3], ["sd sd sd",1]).fast(4).s()
  * @example
  * // The probability can itself be a pattern
  * wchooseCycles(["bd(3,8)","<5 0>"], ["hh hh hh",3]).fast(4).s()

packages/sampler/sample-server.mjs

@@ -9,7 +9,6 @@ import readline from 'readline';
 import os from 'os';
 
 const LOG = !!process.env.LOG || false;
-const PORT = process.env.PORT || 5432;
 const VALID_AUDIO_EXTENSIONS = ['wav', 'mp3', 'ogg'];
 
 const isAudioFile = (f) => {
@@ -55,6 +54,7 @@ async function getBanks(directory, flat = false) {
     banks[bank].push(subDir);
     return subDir;
   });
+  banks._base = `http://localhost:5432`;
   return { banks, files };
 }
 
@@ -134,6 +134,8 @@ const server = http.createServer(async (req, res) => {
   readStream.pipe(res);
 });
 
+// eslint-disable-next-line
+const PORT = process.env.PORT || 5432;
 const IP_ADDRESS = '0.0.0.0';
 let IP;
 const networkInterfaces = os.networkInterfaces();

packages/soundfonts/fontloader.mjs

@@ -1,5 +1,6 @@
 import { noteToMidi, freqToMidi, getSoundIndex } from '@strudel/core';
 import {
+  cleanupNodes,
   getAudioContext,
   registerSound,
   getParamADSR,
@@ -161,22 +162,17 @@ export function registerSoundfonts() {
         const node = bufferSource.connect(envGain);
         const holdEnd = time + duration;
         getParamADSR(node.gain, attack, decay, sustain, release, 0, 0.3, time, holdEnd, 'linear');
-        let envEnd = holdEnd + release + 0.01;
-
         // vibrato
         let vibratoOscillator = getVibratoOscillator(bufferSource.detune, value, time);
         // pitch envelope
         getPitchEnvelope(bufferSource.detune, value, time, holdEnd);
-
-        bufferSource.stop(envEnd);
-        const stop = (releaseTime) => {};
         bufferSource.onended = () => {
-          bufferSource.disconnect();
+          cleanupNodes([bufferSource, vibratoOscillator, node]);
-          vibratoOscillator?.stop();
-          node.disconnect();
           onended();
         };
-        return { node, stop };
+        const envEnd = holdEnd + release + 0.01;
+        bufferSource.stop(envEnd);
+        return { node, stop: bufferSource.stop };
       },
       { type: 'soundfont', prebake: true, fonts },
     );

packages/superdough/helpers.mjs

@@ -191,7 +191,8 @@ export function applyParameterModulators(audioContext, param, start, end, envelo
   const lfo = getParamLfo(audioContext, param, start, end, lfoValues);
   return { lfo, disconnect: () => lfo?.disconnect() };
 }
-export function createFilter(context, start, end, params, cps, cycle) {
+
+export function createFilter(context, start, end, params, cps) {
   let {
     frequency,
     anchor,
@@ -201,14 +202,12 @@ export function createFilter(context, start, end, params, cps, cycle) {
     q = 1,
     drive = 0.69,
     depth,
-    depthfrequency,
     dcoffset = -0.5,
     skew,
     shape,
     rate,
     sync,
   } = params;
-
   let frequencyParam, filter;
   if (model === 'ladder') {
     filter = getWorklet(context, 'ladder-processor', { frequency, q, drive });
@@ -239,25 +238,8 @@ export function createFilter(context, start, end, params, cps, cycle) {
   if (sync != null) {
     rate = cps * sync;
   }
-  const hasLFO = [depth, depthfrequency, skew, shape, rate].some((v) => v !== undefined);
+  const lfoValues = { depth, dcoffset, skew, shape, frequency: rate };
-  if (hasLFO) {
+  getParamLfo(context, frequencyParam, start, end, lfoValues);
-    depth = depth ?? 1;
-    const time = cycle / cps;
-    const modDepth = depthfrequency ?? (depth ?? 1) * frequency;
-    const lfoValues = {
-      depth: modDepth,
-      dcoffset,
-      skew,
-      shape,
-      frequency: rate ?? cps,
-      min: -frequency + 30,
-      max: 20000 - frequency,
-      time,
-      curve: 1,
-    };
-    getParamLfo(context, frequencyParam, start, end, lfoValues);
-  }
-
   return filter;
 }
 
@@ -280,15 +262,7 @@ export function drywet(dry, wet, wetAmount = 0) {
   let mix = ac.createGain();
   dry_gain.connect(mix);
   wet_gain.connect(mix);
-  return {
+  return mix;
-    node: mix,
-    onended: () => {
-      dry_gain.disconnect(mix);
-      wet_gain.disconnect(mix);
-      dry.disconnect(dry_gain);
-      wet.disconnect(wet_gain);
-    },
-  };
 }
 
 let curves = ['linear', 'exponential'];
@@ -323,10 +297,6 @@ export function getVibratoOscillator(param, value, t) {
     gain.gain.value = vibmod * 100;
     vibratoOscillator.connect(gain);
     gain.connect(param);
-    vibratoOscillator.onended = () => {
-      gain.disconnect(param);
-      vibratoOscillator.disconnect(gain);
-    };
     vibratoOscillator.start(t);
     return vibratoOscillator;
   }
@@ -380,9 +350,9 @@ const mod = (freq, range = 1, type = 'sine') => {
   }
 
   osc.start();
-  const g = gainNode(range);
+  const g = new GainNode(ctx, { gain: range });
   osc.connect(g); // -range, range
-  return { node: g, stop: (t) => osc.stop(t), osc: osc };
+  return { node: g, stop: (t) => osc.stop(t) };
 };
 const fm = (frequencyparam, harmonicityRatio, modulationIndex, wave = 'sine') => {
   const carrfreq = frequencyparam.value;
@@ -434,11 +404,6 @@ export function applyFM(param, value, begin) {
       modulator.connect(envGain);
       envGain.connect(param);
     }
-    fmmod.osc.onended = () => {
-      envGain.disconnect();
-      modulator.disconnect();
-      fmmod.osc.disconnect();
-    };
   }
   return { stop };
 }
@@ -540,7 +505,7 @@ export const getDistortion = (distort, postgain, algorithm) => {
 };
 
 export const getFrequencyFromValue = (value, defaultNote = 36) => {
-  let { note, freq, octave = 0 } = value;
+  let { note, freq } = value;
   note = note || defaultNote;
   if (typeof note === 'string') {
     note = noteToMidi(note); // e.g. c3 => 48
@@ -549,14 +514,17 @@ export const getFrequencyFromValue = (value, defaultNote = 36) => {
   if (!freq && typeof note === 'number') {
     freq = midiToFreq(note); // + 48);
   }
-  freq *= Math.pow(2, octave);
+
   return Number(freq);
 };
 
-export const destroyAudioWorkletNode = (node) => {
+export const cleanupNode = (node, time) => {
-  if (node == null) {
+  if (node == null) return;
-    return;
+  node.disconnect?.();
-  }
+  node.parameters?.get('end')?.setValueAtTime(0, 0);
-  node.disconnect();
+  node.stop?.(time);
-  node.parameters.get('end')?.setValueAtTime(0, 0);
+};
+
+export const cleanupNodes = (nodes, time) => {
+  nodes.forEach((n) => cleanupNode(n, time));
 };

packages/superdough/noise.mjs

@@ -65,9 +65,8 @@ export function getNoiseOscillator(type = 'white', t, density = 0.02) {
 export function getNoiseMix(inputNode, wet, t) {
   const noiseOscillator = getNoiseOscillator('pink', t);
   const noiseMix = drywet(inputNode, noiseOscillator.node, wet);
-  noiseOscillator.node.onended = () => noiseMix.onended();
   return {
-    node: noiseMix.node,
+    node: noiseMix,
     stop: (time) => noiseOscillator?.stop(time),
   };
 }

packages/superdough/sampler.mjs

@@ -1,7 +1,7 @@
-import { getBaseURL, getCommonSampleInfo } from './util.mjs';
+import { getCommonSampleInfo } from './util.mjs';
 import { registerSound, registerWaveTable } from './index.mjs';
 import { getAudioContext } from './audioContext.mjs';
-import { getADSRValues, getParamADSR, getPitchEnvelope, getVibratoOscillator } from './helpers.mjs';
+import { getADSRValues, cleanupNodes, getParamADSR, getPitchEnvelope, getVibratoOscillator } from './helpers.mjs';
 import { logger } from './logger.mjs';
 
 const bufferCache = {}; // string: Promise<ArrayBuffer>
@@ -211,7 +211,7 @@ export async function fetchSampleMap(url) {
     // not a browser
     return;
   }
-  const base = getBaseURL(url);
+  const base = url.split('/').slice(0, -1).join('/');
   if (typeof fetch === 'undefined') {
     // skip fetch when in node / testing
     return;
@@ -319,19 +319,11 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
 
   const out = ac.createGain(); // we need a separate gain for the cutgroups because firefox...
   node.connect(out);
-  bufferSource.onended = function () {
+  const stop = () => {
-    bufferSource.disconnect();
+    cleanupNodes([bufferSource, vibratoOscillator, node]);
-    vibratoOscillator?.stop();
-    node.disconnect();
-    out.disconnect();
     onended();
   };
-  let envEnd = holdEnd + release + 0.01;
+  const handle = { node: out, stop };
-  bufferSource.stop(envEnd);
-  const stop = (endTime) => {
-    bufferSource.stop(endTime);
-  };
-  const handle = { node: out, bufferSource, stop };
 
   // cut groups
   if (cut !== undefined) {

packages/superdough/superdough.mjs

@@ -7,9 +7,22 @@ This program is free software: you can redistribute it and/or modify it under th
 import './feedbackdelay.mjs';
 import './reverb.mjs';
 import './vowel.mjs';
-import { nanFallback, _mod, cycleToSeconds, pickAndRename } from './util.mjs';
+import { _mod, clamp, cycleToSeconds, pickAndRename } from './util.mjs';
 import workletsUrl from './worklets.mjs?audioworklet';
-import { createFilter, gainNode, getCompressor, getDistortion, getLfo, getWorklet, effectSend } from './helpers.mjs';
+import {
+  cleanupNode,
+  cleanupNodes,
+  createFilter,
+  gainNode,
+  getADSRValues,
+  getCompressor,
+  getDistortion,
+  getLfo,
+  getParamADSR,
+  getWorklet,
+  effectSend,
+  webAudioTimeout,
+} from './helpers.mjs';
 import { map } from 'nanostores';
 import { logger } from './logger.mjs';
 import { loadBuffer } from './sampler.mjs';
@@ -159,6 +172,9 @@ let defaultDefaultValues = {
   i: 1,
   velocity: 1,
   fft: 8,
+  tremolodepth: 1,
+  tremolophase: 0,
+  drive: 0.69,
 };
 
 const defaultDefaultDefaultValues = Object.freeze({ ...defaultDefaultValues });
@@ -391,44 +407,17 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   }
   // destructure
   let {
-    tremolo,
-    tremolosync,
-    tremolodepth = 1,
-    tremoloskew,
-    tremolophase = 0,
-    tremoloshape,
     s = getDefaultValue('s'),
     bank,
     source,
-    gain = getDefaultValue('gain'),
     postgain = getDefaultValue('postgain'),
-    density = getDefaultValue('density'),
     duckorbit,
     duckonset,
     duckattack,
     duckdepth,
     djf,
-    // filters
-    fanchor = getDefaultValue('fanchor'),
     release = 0,
-
-    //phaser
-    phaserrate: phaser,
-    phaserdepth = getDefaultValue('phaserdepth'),
-    phasersweep,
-    phasercenter,
-    //
-    coarse,
-
-    crush,
     dry,
-    shape,
-    shapevol = getDefaultValue('shapevol'),
-    distort,
-    distortvol = getDefaultValue('distortvol'),
-    distorttype = getDefaultValue('distorttype'),
-    pan,
-    vowel,
     delay = getDefaultValue('delay'),
     delayfeedback = getDefaultValue('delayfeedback'),
     delaysync = getDefaultValue('delaysync'),
@@ -443,18 +432,21 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     irspeed,
     irbegin,
     i = getDefaultValue('i'),
-    velocity = getDefaultValue('velocity'),
     analyze, // analyser wet
     fft = getDefaultValue('fft'), // fftSize 0 - 10
-    compressor: compressorThreshold,
+    chain: subChains = [],
-    compressorRatio,
-    compressorKnee,
-    compressorAttack,
-    compressorRelease,
   } = value;
 
   delaytime = delaytime ?? cycleToSeconds(delaysync, cps);
 
+  if (value.wtPosSynced != null) {
+    value.wtPosRate /= cps;
+  }
+
+  if (value.wtWarpSynced != null) {
+    value.wtWarpRate /= cps;
+  }
+
   const orbitChannels = mapChannelNumbers(
     multiChannelOrbits && orbit > 0 ? [orbit * 2 - 1, orbit * 2] : getDefaultValue('channels'),
   );
@@ -465,18 +457,8 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     audioController.duck(duckorbit, t, duckonset, duckattack, duckdepth);
   }
 
-  gain = applyGainCurve(nanFallback(gain, 1));
   postgain = applyGainCurve(postgain);
-  shapevol = applyGainCurve(shapevol);
-  distortvol = applyGainCurve(distortvol);
   delay = applyGainCurve(delay);
-  velocity = applyGainCurve(velocity);
-  tremolodepth = applyGainCurve(tremolodepth);
-  gain *= velocity; // velocity currently only multiplies with gain. it might do other things in the future
-
-  const end = t + hapDuration;
-  const endWithRelease = end + release;
-  const chainID = Math.round(Math.random() * 1000000);
 
   // oldest audio nodes will be destroyed if maximum polyphony is exceeded
   for (let i = 0; i <= activeSoundSources.size - maxPolyphony; i++) {
@@ -489,8 +471,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     activeSoundSources.delete(chainID);
   }
 
-  let audioNodes = [];
-
   if (['-', '~', '_'].includes(s)) {
     return;
   }
@@ -498,206 +478,318 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     s = `${bank}_${s}`;
     value.s = s;
   }
-
+  const end = t + hapDuration;
-  // get source AudioNode
+  let fullRelease = release;
-  let sourceNode;
+  for (const ch of subChains) {
-  if (source) {
+    fullRelease = Math.max(fullRelease, ch.release ?? 0);
-    sourceNode = source(t, value, hapDuration, cps);
+  }
-  } else if (getSound(s)) {
+  const fullEndWithRelease = end + fullRelease + 0.02;
-    const { onTrigger } = getSound(s);
+  // The following ensures we run through the value once as normal _and then_ through all the subchains
-    const onEnded = () => {
+  subChains = [value, ...subChains];
-      audioNodes.forEach((n) => n?.disconnect());
+  let prev;
-      activeSoundSources.delete(chainID);
+  for (const ch of subChains) {
-    };
+    const audioNodes = [];
-    const soundHandle = await onTrigger(t, value, onEnded, cps);
+    const chain = [];
-
+    ch.duration = hapDuration;
-    if (soundHandle) {
+    const endWithRelease = end + Math.max(release, ch.release ?? 0);
-      sourceNode = soundHandle.node;
+    const chainID = Math.round(Math.random() * 1000000);
-      activeSoundSources.set(chainID, new WeakRef(soundHandle)); // allow GC
+    // get source AudioNode
+    let sourceNode;
+    if (source) {
+      sourceNode = source(t, ch, hapDuration, cps);
+      chain.push(sourceNode);
+    } else if (ch.s !== undefined && getSound(ch.s)) {
+      const { onTrigger } = getSound(ch.s);
+      const soundHandle = await onTrigger(t, ch, () => {}, cps);
+      if (soundHandle) {
+        sourceNode = soundHandle.node;
+        activeSoundSources.set(chainID, new WeakRef(soundHandle)); // allow GC
+      }
+      chain.push(sourceNode);
+    } else if (ch.s !== undefined) {
+      throw new Error(`sound ${ch.s} not found! Is it loaded?`);
     }
-  } else {
+    if (ac.currentTime > t) {
-    throw new Error(`sound ${s} not found! Is it loaded?`);
+      logger('[webaudio] skip hap: still loading', ac.currentTime - t);
-  }
+      return;
-  if (!sourceNode) {
-    // if onTrigger does not return anything, we will just silently skip
-    // this can be used for things like speed(0) in the sampler
-    return;
-  }
-
-  if (ac.currentTime > t) {
-    logger('[webaudio] skip hap: still loading', ac.currentTime - t);
-    return;
-  }
-  const chain = []; // audio nodes that will be connected to each other sequentially
-  chain.push(sourceNode);
-  stretch !== undefined && chain.push(getWorklet(ac, 'phase-vocoder-processor', { pitchFactor: stretch }));
-
-  // gain stage
-  chain.push(gainNode(gain));
-
-  // filter
-  const ftype = getFilterType(value.ftype);
-
-  if (value.cutoff !== undefined) {
-    const lpMap = {
-      frequency: 'cutoff',
-      q: 'resonance',
-      attack: 'lpattack',
-      decay: 'lpdecay',
-      sustain: 'lpsustain',
-      release: 'lprelease',
-      env: 'lpenv',
-      anchor: 'fanchor',
-      model: 'ftype',
-      drive: 'drive',
-      rate: 'lprate',
-      sync: 'lpsync',
-      depth: 'lpdepth',
-      depthfrequency: 'lpdepthfrequency',
-      shape: 'lpshape',
-      dcoffset: 'lpdc',
-      skew: 'lpskew',
-    };
-    const lpParams = pickAndRename(value, lpMap);
-    lpParams.type = 'lowpass';
-    let lp = () => createFilter(ac, t, end, lpParams, cps, cycle);
-    chain.push(lp());
-    if (ftype === '24db') {
-      chain.push(lp());
     }
-  }
+    const prevExists = prev !== undefined;
-
+    const sourceExists = sourceNode !== undefined;
-  if (value.hcutoff !== undefined) {
+    if (!prevExists && !sourceExists) {
-    const hpMap = {
+      // if there are no signals, we will just silently continue
-      frequency: 'hcutoff',
+      // this can be used for things like speed(0) in the sampler
-      q: 'hresonance',
+      continue;
-      attack: 'hpattack',
+    } else if (prevExists && !sourceExists) {
-      decay: 'hpdecay',
+      // just FX -- apply ADSR now
-      sustain: 'hpsustain',
+      const adsrParams = [ch.attack, ch.decay, ch.sustain, ch.release];
-      release: 'hprelease',
+      if (adsrParams.some((v) => v != null)) {
-      env: 'hpenv',
+        const [attack, decay, sustain, release] = getADSRValues(adsrParams, 'linear', [0.001, 0.05, 0.6, 0.01]);
-      anchor: 'fanchor',
+        const adsrNode = gainNode(1);
-      model: 'ftype',
+        chain.push(adsrNode);
-      drive: 'drive',
+        getParamADSR(adsrNode.gain, attack, decay, sustain, release, 0, 1, t, t + hapDuration, 'linear');
-      rate: 'hprate',
+      }
-      sync: 'hpsync',
-      depth: 'hpdepth',
-      depthfrequency: 'hpdepthfrequency',
-      shape: 'hpshape',
-      dcoffset: 'hpdc',
-      skew: 'hpskew',
-    };
-    const hpParams = pickAndRename(value, hpMap);
-    hpParams.type = 'highpass';
-    let hp = () => createFilter(ac, t, end, hpParams, cps, cycle);
-    chain.push(hp());
-    if (ftype === '24db') {
-      chain.push(hp());
     }
-  }
+    webAudioTimeout(
-
+      ac,
-  if (value.bandf !== undefined) {
+      () => {
-    const bpMap = {
+        audioNodes.forEach((n) => n?.disconnect());
-      frequency: 'bandf',
+        activeSoundSources.delete(chainID);
-      q: 'bandq',
+      },
-      attack: 'bpattack',
+      0,
-      decay: 'bpdecay',
+      fullEndWithRelease,
-      sustain: 'bpsustain',
-      release: 'bprelease',
-      env: 'bpenv',
-      anchor: 'fanchor',
-      model: 'ftype',
-      drive: 'drive',
-      rate: 'bprate',
-      sync: 'bpsync',
-      depth: 'bpdepth',
-      depthfrequency: 'bpdepthfrequency',
-      shape: 'bpshape',
-      dcoffset: 'bpdc',
-      skew: 'bpskew',
-    };
-    const bpParams = pickAndRename(value, bpMap);
-    bpParams.type = 'bandpass';
-    let bp = () => createFilter(ac, t, end, bpParams, cps, cycle);
-    chain.push(bp());
-    if (ftype === '24db') {
-      chain.push(bp());
-    }
-  }
-
-  if (vowel !== undefined) {
-    const vowelFilter = ac.createVowelFilter(vowel);
-    chain.push(vowelFilter);
-  }
-
-  // effects
-  coarse !== undefined && chain.push(getWorklet(ac, 'coarse-processor', { coarse }));
-  crush !== undefined && chain.push(getWorklet(ac, 'crush-processor', { crush }));
-  shape !== undefined && chain.push(getWorklet(ac, 'shape-processor', { shape, postgain: shapevol }));
-  distort !== undefined && chain.push(getDistortion(distort, distortvol, distorttype));
-
-  if (tremolosync != null) {
-    tremolo = cps * tremolosync;
-  }
-
-  if (value.wtPosSynced != null) {
-    value.wtPosRate /= cps;
-  }
-
-  if (value.wtWarpSynced != null) {
-    value.wtWarpRate /= cps;
-  }
-
-  if (tremolo !== undefined) {
-    // Allow clipping of modulator for more dynamic possiblities, and to prevent speaker overload
-    // EX:  a triangle waveform will clip like this /-\ when the depth is above 1
-    const gain = Math.max(1 - tremolodepth, 0);
-    const amGain = new GainNode(ac, { gain });
-
-    const time = cycle / cps;
-    const lfo = getLfo(ac, t, endWithRelease, {
-      skew: tremoloskew ?? (tremoloshape != null ? 0.5 : 1),
-      frequency: tremolo,
-      depth: tremolodepth,
-      time,
-      dcoffset: 0,
-      shape: tremoloshape,
-      phaseoffset: tremolophase,
-      min: 0,
-      max: 1,
-      curve: 1.5,
-    });
-    lfo.connect(amGain.gain);
-    audioNodes.push(lfo);
-    chain.push(amGain);
-  }
-
-  compressorThreshold !== undefined &&
-    chain.push(
-      getCompressor(ac, compressorThreshold, compressorRatio, compressorKnee, compressorAttack, compressorRelease),
     );
+    let {
+      gain = getDefaultValue('gain'),
+      velocity = getDefaultValue('velocity'),
+      shapevol = getDefaultValue('shapevol'),
+      distorttype = getDefaultValue('distorttype'),
+      distortvol = getDefaultValue('distortvol'),
+      tremolodepth = getDefaultValue('tremolodepth'),
+      phaserdepth = getDefaultValue('phaserdepth'),
+      delay = getDefaultValue('delay'),
+      delayfeedback = getDefaultValue('delayfeedback'),
+      delaysync = getDefaultValue('delaysync'),
+      delaytime,
+    } = ch;
+    delaytime = delaytime ?? cycleToSeconds(delaysync, cps);
+    gain = applyGainCurve(gain);
+    velocity = applyGainCurve(velocity);
+    gain *= velocity; // velocity currently only multiplies with gain. it might do other things in the future
+    shapevol = applyGainCurve(shapevol);
+    distortvol = applyGainCurve(distortvol);
+    tremolodepth = applyGainCurve(tremolodepth);
+    ch.drive = ch.drive ?? getDefaultValue('drive');
+    ch.fanchor = ch.fanchor ?? getDefaultValue('fanchor');
+    ch.stretch !== undefined && chain.push(getWorklet(ac, 'phase-vocoder-processor', { pitchFactor: ch.stretch }));
 
-  // panning
+    // gain stage
-  if (pan !== undefined) {
+    chain.push(gainNode(gain));
-    const panner = ac.createStereoPanner();
+
-    panner.pan.value = 2 * pan - 1;
+    //filter
-    chain.push(panner);
+    const ftype = getFilterType(ch.ftype);
-  }
+    if (ch.cutoff !== undefined) {
-  // phaser
+      const lpMap = {
-  if (phaser !== undefined && phaserdepth > 0) {
+        frequency: 'cutoff',
-    const phaserFX = getPhaser(t, endWithRelease, phaser, phaserdepth, phasercenter, phasersweep);
+        q: 'resonance',
-    chain.push(phaserFX);
+        attack: 'lpattack',
+        decay: 'lpdecay',
+        sustain: 'lpsustain',
+        release: 'lprelease',
+        env: 'lpenv',
+        anchor: 'fanchor',
+        model: 'ftype',
+        drive: 'drive',
+        rate: 'lprate',
+        sync: 'lpsync',
+        depth: 'lpdepth',
+        shape: 'lpshape',
+        dcoffset: 'lpdc',
+        skew: 'lpskew',
+      };
+      const lpParams = pickAndRename(ch, lpMap);
+      lpParams.type = 'lowpass';
+      let lp = () => createFilter(ac, t, end, lpParams, cps);
+      chain.push(lp());
+      if (ch.ftype === '24db') {
+        chain.push(lp());
+      }
+    }
+
+    if (ch.hcutoff !== undefined) {
+      const hpMap = {
+        frequency: 'hcutoff',
+        q: 'hresonance',
+        attack: 'hpattack',
+        decay: 'hpdecay',
+        sustain: 'hpsustain',
+        release: 'hprelease',
+        env: 'hpenv',
+        anchor: 'fanchor',
+        model: 'ftype',
+        drive: 'drive',
+        rate: 'hprate',
+        sync: 'hpsync',
+        depth: 'hpdepth',
+        shape: 'hpshape',
+        dcoffset: 'hpdc',
+        skew: 'hpskew',
+      };
+      const hpParams = pickAndRename(ch, hpMap);
+      hpParams.type = 'highpass';
+      let hp = () => createFilter(ac, t, end, hpParams, cps);
+      chain.push(hp());
+      if (ch.ftype === '24db') {
+        chain.push(hp());
+      }
+    }
+
+    if (ch.bandf !== undefined) {
+      const bpMap = {
+        frequency: 'bandf',
+        q: 'bandq',
+        attack: 'bpattack',
+        decay: 'bpdecay',
+        sustain: 'bpsustain',
+        release: 'bprelease',
+        env: 'bpenv',
+        anchor: 'fanchor',
+        model: 'ftype',
+        drive: 'drive',
+        rate: 'bprate',
+        sync: 'bpsync',
+        depth: 'bpdepth',
+        shape: 'bpshape',
+        dcoffset: 'bpdc',
+        skew: 'bpskew',
+      };
+      const bpParams = pickAndRename(ch, bpMap);
+      bpParams.type = 'bandpass';
+      let bp = () => createFilter(ac, t, end, bpParams, cps);
+      chain.push(bp());
+      if (ftype === '24db') {
+        chain.push(bp());
+      }
+    }
+
+    if (ch.vowel !== undefined) {
+      const vowelFilter = ac.createVowelFilter(ch.vowel);
+      chain.push(vowelFilter);
+    }
+
+    // effects
+    ch.coarse !== undefined && chain.push(getWorklet(ac, 'coarse-processor', { coarse: ch.coarse }));
+    ch.crush !== undefined && chain.push(getWorklet(ac, 'crush-processor', { crush: ch.crush }));
+    ch.shape !== undefined && chain.push(getWorklet(ac, 'shape-processor', { shape: ch.shape, postgain: shapevol }));
+    ch.distort !== undefined && chain.push(getDistortion(ch.distort, distortvol, distorttype));
+
+    let tremolo = ch.tremolo;
+    if (ch.tremolosync != null) {
+      tremolo = cps * ch.tremolosync;
+    }
+
+    if (tremolo !== undefined) {
+      // Allow clipping of modulator for more dynamic possiblities, and to prevent speaker overload
+      // EX:  a triangle waveform will clip like this /-\ when the depth is above 1
+      const gain = Math.max(1 - tremolodepth, 0);
+      const amGain = new GainNode(ac, { gain });
+
+      const time = cycle / cps;
+      const lfo = getLfo(ac, t, endWithRelease, {
+        skew: ch.tremoloskew ?? (ch.tremoloshape != null ? 0.5 : 1),
+        frequency: tremolo,
+        depth: tremolodepth,
+        time,
+        dcoffset: 0,
+        shape: ch.tremoloshape,
+        phaseoffset: ch.tremolophase,
+        min: 0,
+        max: 1,
+        curve: 1.5,
+      });
+      lfo.connect(amGain.gain);
+      chain.push(amGain);
+    }
+
+    ch.compressor !== undefined &&
+      chain.push(
+        getCompressor(
+          ac,
+          ch.compressor,
+          ch.compressorRatio,
+          ch.compressorKnee,
+          ch.compressorAttack,
+          ch.compressorRelease,
+        ),
+      );
+
+    // panning
+    if (ch.pan !== undefined) {
+      const panner = ac.createStereoPanner();
+      panner.pan.value = 2 * ch.pan - 1;
+      chain.push(panner);
+    }
+    // phaser
+    if (ch.phaserrate !== undefined && phaserdepth > 0) {
+      const phaserFX = getPhaser(t, endWithRelease, ch.phaserrate, phaserdepth, ch.phasercenter, ch.phasersweep);
+      chain.push(phaserFX);
+    }
+    // delay
+    if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
+      const dry = gainNode(1);
+      delayfeedback = clamp(delayfeedback, 0, 0.98);
+      const delayNode = ac.createFeedbackDelay(1, delaytime, delayfeedback);
+      const wetDelay = gainNode(delay);
+      const dryDelay = gainNode(ch.dry ?? 1);
+      const sum = new GainNode(ac, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+      dry.connect(dryDelay).connect(sum);
+      dry.connect(delayNode).connect(wetDelay).connect(sum);
+      const stop = () => cleanupNodes([dryDelay, delayNode, dry, wetDelay]);
+      chain.push({ input: dry, output: sum, disconnect: stop });
+    }
+    // reverb
+    if (ch.room > 0) {
+      let roomIR;
+      if (ch.ir !== undefined) {
+        let url;
+        let sample = getSound(ch.ir);
+        if (Array.isArray(sample)) {
+          url = sample.data.samples[ch.i % sample.data.samples.length];
+        } else if (typeof sample === 'object') {
+          url = Object.values(sample.data.samples).flat()[ch.i % Object.values(sample.data.samples).length];
+        }
+        roomIR = await loadBuffer(url, ac, ch.ir, 0);
+      }
+      const dry = gainNode(1);
+      const reverbNode = ac.createReverb(
+        ch.roomsize,
+        ch.roomfade,
+        ch.roomlp,
+        ch.roomdim,
+        roomIR,
+        ch.irspeed,
+        ch.irbegin,
+      );
+      const wetReverb = gainNode(ch.room);
+      const dryReverb = gainNode(ch.dry ?? 1);
+      const sum = new GainNode(ac, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+      dry.connect(dryReverb).connect(sum);
+      dry.connect(reverbNode).connect(wetReverb).connect(sum);
+      const stop = () => cleanupNodes([dryReverb, reverbNode, dry, wetReverb]);
+      chain.push({ input: dry, output: sum, disconnect: stop });
+    }
+    if (prevExists) {
+      const prevOut = prev.output ?? prev;
+      if (sourceExists) {
+        // mix with the previous output
+        const mixer = new GainNode(ac, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+        prevOut.connect(mixer);
+        chain.push(mixer);
+      } else {
+        prevOut.connect(chain[0]);
+      }
+    }
+    // connect chain elements together
+    chain.slice(1).reduce((last, current) => {
+      const lastC = last.output ?? last;
+      const currentC = current.input ?? current;
+      lastC.connect(currentC);
+      return current.output ?? current;
+    }, chain[0]);
+    audioNodes.push(...chain);
+    prev = chain[chain.length - 1];
   }
+  const outerAudioNodes = [];
+  const outerChain = [prev];
 
   // last gain
   const post = new GainNode(ac, { gain: postgain });
-  chain.push(post);
+  outerChain.push(post);
 
   // delay
   if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
     orbitBus.getDelay(delaytime, delayfeedback, t);
     const send = orbitBus.sendDelay(post, delay);
-    audioNodes.push(send);
+    outerAudioNodes.push(send);
   }
   // reverb
   if (room > 0) {
@@ -714,7 +806,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     }
     orbitBus.getReverb(roomsize, roomfade, roomlp, roomdim, roomIR, irspeed, irbegin);
     const send = orbitBus.sendReverb(post, room);
-    audioNodes.push(send);
+    outerAudioNodes.push(send);
   }
 
   if (djf != null) {
@@ -725,20 +817,32 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   if (analyze) {
     const analyserNode = getAnalyserById(analyze, 2 ** (fft + 5));
     const analyserSend = effectSend(post, analyserNode, 1);
-    audioNodes.push(analyserSend);
+    outerAudioNodes.push(analyserSend);
   }
   if (dry != null) {
     dry = applyGainCurve(dry);
     const dryGain = new GainNode(ac, { gain: dry });
-    chain.push(dryGain);
+    outerChain.push(dryGain);
     orbitBus.connectToOutput(dryGain);
   } else {
     orbitBus.connectToOutput(post);
   }
-
   // connect chain elements together
-  chain.slice(1).reduce((last, current) => last.connect(current), chain[0]);
+  outerChain.slice(1).reduce((last, current) => {
-  audioNodes = audioNodes.concat(chain);
+    const lastC = last.output ?? last;
+    const currentC = current.input ?? current;
+    lastC.connect(currentC);
+    return current.output ?? current;
+  }, outerChain[0]);
+  outerAudioNodes.push(...outerChain);
+  webAudioTimeout(
+    ac,
+    () => {
+      outerAudioNodes.forEach((n) => n?.disconnect?.());
+    },
+    0,
+    fullEndWithRelease,
+  );
 };
 
 export const superdoughTrigger = (t, hap, ct, cps) => {

packages/superdough/synth.mjs

@@ -3,7 +3,7 @@ import { registerSound, soundMap } from './superdough.mjs';
 import { getAudioContext } from './audioContext.mjs';
 import {
   applyFM,
-  destroyAudioWorkletNode,
+  cleanupNodes,
   gainNode,
   getADSRValues,
   getFrequencyFromValue,
@@ -47,31 +47,21 @@ export function registerSynthSounds() {
           'linear',
           [0.001, 0.05, 0.6, 0.01],
         );
-
+        const { node: o, stop } = getOscillator(s, t, value);
         // turn down
         const g = gainNode(0.3);
-
+        o.onended = () => {
-        let sound = getOscillator(s, t, value, () => {
+          cleanupNodes([o, g]);
-          g.disconnect();
           onended();
-        });
+        };
-
+        const node = o.connect(g).connect(gainNode(1));
-        let { node: o, stop, triggerRelease } = sound;
+        const holdEnd = t + value.duration;
-
-        const { duration } = value;
-
-        const envGain = gainNode(1);
-        let node = o.connect(g).connect(envGain);
-        const holdEnd = t + duration;
         getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, t, holdEnd, 'linear');
         const envEnd = holdEnd + release + 0.01;
-        triggerRelease?.(envEnd);
         stop(envEnd);
         return {
           node,
-          stop: (endTime) => {
+          stop,
-            stop(endTime);
-          },
         };
       },
       { type: 'synth', prebake: true },
@@ -111,12 +101,7 @@ export function registerSynthSounds() {
       const mix = gainNode(mixGain);
 
       o.onended = () => {
-        o.disconnect();
+        cleanupNodes([o, g, sat, noise.node, noiseGain]);
-        g.disconnect();
-        sat.disconnect();
-        noise.node.disconnect();
-        noiseGain.disconnect();
-        mix.disconnect();
         onended();
       };
 
@@ -134,13 +119,10 @@ export function registerSynthSounds() {
       mix.gain.linearRampToValueAtTime(0, end);
 
       o.stop(end);
-      noise.stop(end);
 
       return {
         node,
-        stop: (endTime) => {
+        stop: o.stop,
-          o.stop(endTime);
-        },
       };
     },
     { type: 'synth', prebake: true },
@@ -184,29 +166,22 @@ export function registerSynthSounds() {
       getPitchEnvelope(o.parameters.get('detune'), value, begin, holdend);
       const vibratoOscillator = getVibratoOscillator(o.parameters.get('detune'), value, begin);
       const fm = applyFM(o.parameters.get('frequency'), value, begin);
-      let envGain = gainNode(1);
+      const node = o.connect(gainNode(1));
-      envGain = o.connect(envGain);
 
-      getParamADSR(envGain.gain, attack, decay, sustain, release, 0, 0.3 * gainAdjustment, begin, holdend, 'linear');
+      getParamADSR(node.gain, attack, decay, sustain, release, 0, 0.3 * gainAdjustment, begin, holdend, 'linear');
 
-      let timeoutNode = webAudioTimeout(
+      const timeoutNode = webAudioTimeout(
         ac,
         () => {
-          destroyAudioWorkletNode(o);
+          cleanupNodes([o, fm, vibratoOscillator]);
-          envGain.disconnect();
           onended();
-          fm?.stop();
-          vibratoOscillator?.stop();
         },
         begin,
         end,
       );
-
       return {
-        node: envGain,
+        node,
-        stop: (time) => {
+        stop: timeoutNode.stop,
-          timeoutNode.stop(time);
-        },
       };
     },
     { prebake: true, type: 'synth' },
@@ -259,30 +234,21 @@ export function registerSynthSounds() {
           outputChannelCount: [2],
         },
       );
-
       o.port.postMessage({ codeText: byteBeatExpression, byteBeatStartTime, frequency });
-
+      const node = o.connect(gainNode(1));
-      let envGain = gainNode(1);
+      getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, begin, holdend, 'linear');
-      envGain = o.connect(envGain);
+      const timeoutNode = webAudioTimeout(
-
-      getParamADSR(envGain.gain, attack, decay, sustain, release, 0, 1, begin, holdend, 'linear');
-
-      let timeoutNode = webAudioTimeout(
         ac,
         () => {
-          destroyAudioWorkletNode(o);
+          cleanupNodes([node, o]);
-          envGain.disconnect();
           onended();
         },
         begin,
         end,
       );
-
       return {
-        node: envGain,
+        node,
-        stop: (time) => {
+        stop: timeoutNode.stop,
-          timeoutNode.stop(time);
-        },
       };
     },
     { prebake: true, type: 'synth' },
@@ -332,34 +298,26 @@ export function registerSynthSounds() {
       getPitchEnvelope(o.parameters.get('detune'), value, begin, holdend);
       const vibratoOscillator = getVibratoOscillator(o.parameters.get('detune'), value, begin);
       const fm = applyFM(o.parameters.get('frequency'), value, begin);
-      let envGain = gainNode(1);
+      const node = o.connect(gainNode(1));
-      envGain = o.connect(envGain);
 
-      getParamADSR(envGain.gain, attack, decay, sustain, release, 0, 1, begin, holdend, 'linear');
+      getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, begin, holdend, 'linear');
       let lfo;
       if (pwsweep != 0) {
         lfo = getLfo(ac, begin, end, { frequency: pwrate, depth: pwsweep });
         lfo.connect(o.parameters.get('pulsewidth'));
       }
-      let timeoutNode = webAudioTimeout(
+      const timeoutNode = webAudioTimeout(
         ac,
         () => {
-          destroyAudioWorkletNode(o);
+          cleanupNodes([node, o, lfo, fm, vibratoOscillator]);
-          destroyAudioWorkletNode(lfo);
-          envGain.disconnect();
           onended();
-          fm?.stop();
-          vibratoOscillator?.stop();
         },
         begin,
         end,
       );
-
       return {
-        node: envGain,
+        node,
-        stop: (time) => {
+        stop: timeoutNode.stop,
-          timeoutNode.stop(time);
-        },
       };
     },
     { prebake: true, type: 'synth' },
@@ -380,31 +338,26 @@ export function registerSynthSounds() {
         let { density } = value;
         sound = getNoiseOscillator(s, t, density);
 
-        let { node: o, stop, triggerRelease } = sound;
+        let { node: o, stop } = sound;
 
         // turn down
         const g = gainNode(0.3);
 
         const { duration } = value;
 
-        o.onended = () => {
-          o.disconnect();
-          g.disconnect();
-          onended();
-        };
-
         const envGain = gainNode(1);
         let node = o.connect(g).connect(envGain);
         const holdEnd = t + duration;
         getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, t, holdEnd, 'linear');
+        o.onended = () => {
+          cleanupNodes([node, o, g]);
+          onended();
+        };
         const envEnd = holdEnd + release + 0.01;
-        triggerRelease?.(envEnd);
         stop(envEnd);
         return {
           node,
-          stop: (endTime) => {
+          stop,
-            stop(endTime);
-          },
         };
       },
       { type: 'synth', prebake: true },
@@ -458,7 +411,7 @@ export function waveformN(partials, phases, type) {
 }
 
 // expects one of waveforms as s
-export function getOscillator(s, t, value, onended) {
+export function getOscillator(s, t, value) {
   const { duration, noise = 0 } = value;
   const partials = value.partials ?? value.n;
   let o;
@@ -480,6 +433,7 @@ export function getOscillator(s, t, value, onended) {
   }
   // set frequency
   o.frequency.value = getFrequencyFromValue(value);
+  o.start(t);
 
   let vibratoOscillator = getVibratoOscillator(o.detune, value, t);
 
@@ -491,24 +445,14 @@ export function getOscillator(s, t, value, onended) {
   if (noise) {
     noiseMix = getNoiseMix(o, noise, t);
   }
-
+  const stop = (time) => {
-  o.onended = () => {
+    fmModulator.stop(time);
-    o.disconnect();
+    vibratoOscillator?.stop(time);
-    noiseMix?.node.disconnect();
+    noiseMix?.stop(time);
-    onended();
+    o.stop(time);
   };
-  o.start(t);
-
   return {
     node: noiseMix?.node || o,
-    stop: (time) => {
+    stop,
-      fmModulator.stop(time);
-      vibratoOscillator?.stop(time);
-      noiseMix?.stop(time);
-      o.stop(time);
-    },
-    triggerRelease: (time) => {
-      // envGain?.stop(time);
-    },
   };
 }

packages/superdough/util.mjs

@@ -114,13 +114,3 @@ export function getCommonSampleInfo(hapValue, bank) {
 export const pickAndRename = (source, map) => {
   return Object.fromEntries(Object.entries(map).map(([newKey, oldKey]) => [newKey, source[oldKey]]));
 };
-
-export const getBaseURL = (url) => {
-  try {
-    // For real URLs
-    return new URL('.', new URL(url)).href.replace(/\/$/, ''); // removes trailing slash
-  } catch {
-    // For pseudo URLS
-    return url.split('/').slice(0, -1).join('/');
-  }
-};

packages/superdough/wavetable.mjs

@@ -1,9 +1,9 @@
 import { getAudioContext, registerSound } from './index.mjs';
-import { getBaseURL, getCommonSampleInfo } from './util.mjs';
+import { getCommonSampleInfo } from './util.mjs';
 import {
   applyFM,
   applyParameterModulators,
-  destroyAudioWorkletNode,
+  cleanupNodes,
   getADSRValues,
   getFrequencyFromValue,
   getParamADSR,
@@ -190,7 +190,6 @@ export const tables = async (url, frameLen, json, options = {}) => {
   if (url.startsWith('local:')) {
     url = `http://localhost:5432`;
   }
-  const base = getBaseURL(url);
   if (typeof fetch !== 'function') {
     // not a browser
     return;
@@ -201,7 +200,7 @@ export const tables = async (url, frameLen, json, options = {}) => {
   }
   return fetch(url)
     .then((res) => res.json())
-    .then((json) => _processTables(json, base, frameLen, options))
+    .then((json) => _processTables(json, url, frameLen, options))
     .catch((error) => {
       console.error(error);
       throw new Error(`error loading "${url}"`);
@@ -319,19 +318,12 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
   const timeoutNode = webAudioTimeout(
     ac,
     () => {
-      destroyAudioWorkletNode(source);
+      cleanupNodes([source, vibratoOscillator, fm, node, wtPosModulators, wtWarpModulators]);
-      vibratoOscillator?.stop();
-      fm?.stop();
-      node.disconnect();
-      wtPosModulators?.disconnect();
-      wtWarpModulators?.disconnect();
       onended();
     },
     t,
     envEnd,
   );
-  handle.stop = (time) => {
+  handle.stop = timeoutNode.stop;
-    timeoutNode.stop(time);
-  };
   return handle;
 }

packages/superdough/worklets.mjs

@@ -532,7 +532,7 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
         const freqVoice = applySemitoneDetuneToFrequency(freq, detuner(n));
         // We must wrap this here because it is passed into sawblep below which
         // has domain [0, 1]
-        const dt = frac(freqVoice * INVSR);
+        const dt = ffrac(freqVoice * INVSR);
         this.phase[n] = this.phase[n] ?? Math.random();
         const v = waveshapes.sawblep(this.phase[n], dt);
 
@@ -543,9 +543,8 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
         if (pn >= 1.0) pn -= 1.0;
         this.phase[n] = pn;
         // invert right and left gain
-        const tmp = gainL;
         gainL = gainR;
-        gainR = tmp;
+        gainR = gainL;
       }
     }
     return true;
@@ -1339,7 +1338,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       const tablePos = clamp(pv(parameters.position, i), 0, 1);
       const idx = tablePos * (this.numFrames - 1);
       const fIdx = idx | 0;
-      const interpT = idx - fIdx;
+      const frac = idx - fIdx;
       const warpAmount = clamp(pv(parameters.warp, i), 0, 1);
       const warpMode = pv(parameters.warpMode, i);
       const phaseRand = clamp(pv(parameters.phaserand, i), 0, 1);
@@ -1369,13 +1368,13 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
         const ph = this._warpPhase(this.phase[n], warpAmount, warpMode);
         const s0 = this._sampleFrame(table[fIdx], ph);
         const s1 = this._sampleFrame(table[Math.min(this.numFrames - 1, fIdx + 1)], ph);
-        let s = lerp(s0, s1, interpT);
+        let s = s0 + (s1 - s0) * frac;
         if (warpMode === WarpMode.FLIP && this.phase[n] < warpAmount) {
           s = -s;
         }
         outL[i] += s * gainL * normalizer;
         outR[i] += s * gainR * normalizer;
-        this.phase[n] = frac(this.phase[n] + dPhase);
+        this.phase[n] = ffrac(this.phase[n] + dPhase);
       }
     }
     return true;

packages/superdough/zzfx.mjs

@@ -3,6 +3,7 @@ import { midiToFreq, noteToMidi } from './util.mjs';
 import { registerSound } from './superdough.mjs';
 import { getAudioContext } from './audioContext.mjs';
 import { buildSamples } from './zzfx_fork.mjs';
+import { cleanupNode } from './helpers.mjs';
 
 export const getZZFX = (value, t) => {
   let {
@@ -84,7 +85,7 @@ export function registerZZFXSounds() {
       (t, value, onended) => {
         const { node: o } = getZZFX({ s: wave, ...value }, t);
         o.onended = () => {
-          o.disconnect();
+          cleanupNode(o);
           onended();
         };
         return {

test/__snapshots__/examples.test.mjs.snap

@@ -1391,75 +1391,6 @@ exports[`runs examples > example "bpdecay" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "bpdepthfrequency" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 1/16 → 1/8 | note:c s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 1/8 → 3/16 | note:c# s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 3/16 → 1/4 | note:c s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 1/4 → 5/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 5/16 → 3/8 | note:c4 s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 3/8 → 7/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 7/16 → 1/2 | note:c s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 1/2 → 9/16 | note:c# s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 9/16 → 5/8 | note:c s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 5/8 → 11/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 11/16 → 3/4 | note:c4 s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 3/4 → 13/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 13/16 → 7/8 | note:c s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 7/8 → 15/16 | note:c# s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 15/16 → 1/1 | note:c s:sawtooth cutoff:600 bpdepthfrequency:200 ]",
-  "[ 1/1 → 17/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 17/16 → 9/8 | note:c4 s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 9/8 → 19/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 19/16 → 5/4 | note:c s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 5/4 → 21/16 | note:c# s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 21/16 → 11/8 | note:c s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 11/8 → 23/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 23/16 → 3/2 | note:c4 s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 3/2 → 25/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 25/16 → 13/8 | note:c s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 13/8 → 27/16 | note:c# s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 27/16 → 7/4 | note:c s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 7/4 → 29/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 29/16 → 15/8 | note:c4 s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 15/8 → 31/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 31/16 → 2/1 | note:c s:sawtooth cutoff:600 bpdepthfrequency:500 ]",
-  "[ 2/1 → 33/16 | note:c# s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 33/16 → 17/8 | note:c s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 17/8 → 35/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 35/16 → 9/4 | note:c4 s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 9/4 → 37/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 37/16 → 19/8 | note:c s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 19/8 → 39/16 | note:c# s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 39/16 → 5/2 | note:c s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 5/2 → 41/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 41/16 → 21/8 | note:c4 s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 21/8 → 43/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 43/16 → 11/4 | note:c s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 11/4 → 45/16 | note:c# s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 45/16 → 23/8 | note:c s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 23/8 → 47/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 47/16 → 3/1 | note:c4 s:sawtooth cutoff:600 bpdepthfrequency:100 ]",
-  "[ 3/1 → 49/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 49/16 → 25/8 | note:c s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 25/8 → 51/16 | note:c# s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 51/16 → 13/4 | note:c s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 13/4 → 53/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 53/16 → 27/8 | note:c4 s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 27/8 → 55/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 55/16 → 7/2 | note:c s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 7/2 → 57/16 | note:c# s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 57/16 → 29/8 | note:c s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 29/8 → 59/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 59/16 → 15/4 | note:c4 s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 15/4 → 61/16 | note:c s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 61/16 → 31/8 | note:c s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 31/8 → 63/16 | note:c# s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-  "[ 63/16 → 4/1 | note:c s:sawtooth cutoff:600 bpdepthfrequency:0 ]",
-]
-`;
-
 exports[`runs examples > example "bpenv" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:c2 s:sawtooth bandf:500 bpattack:0.5 bpenv:4 ]",
@@ -4855,75 +4786,6 @@ exports[`runs examples > example "hpdecay" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "hpdepthfrequency" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 1/16 → 1/8 | note:c s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 1/8 → 3/16 | note:c# s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 3/16 → 1/4 | note:c s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 1/4 → 5/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 5/16 → 3/8 | note:c4 s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 3/8 → 7/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 7/16 → 1/2 | note:c s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 1/2 → 9/16 | note:c# s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 9/16 → 5/8 | note:c s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 5/8 → 11/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 11/16 → 3/4 | note:c4 s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 3/4 → 13/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 13/16 → 7/8 | note:c s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 7/8 → 15/16 | note:c# s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 15/16 → 1/1 | note:c s:sawtooth cutoff:600 hpdepthfrequency:200 ]",
-  "[ 1/1 → 17/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 17/16 → 9/8 | note:c4 s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 9/8 → 19/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 19/16 → 5/4 | note:c s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 5/4 → 21/16 | note:c# s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 21/16 → 11/8 | note:c s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 11/8 → 23/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 23/16 → 3/2 | note:c4 s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 3/2 → 25/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 25/16 → 13/8 | note:c s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 13/8 → 27/16 | note:c# s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 27/16 → 7/4 | note:c s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 7/4 → 29/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 29/16 → 15/8 | note:c4 s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 15/8 → 31/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 31/16 → 2/1 | note:c s:sawtooth cutoff:600 hpdepthfrequency:500 ]",
-  "[ 2/1 → 33/16 | note:c# s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 33/16 → 17/8 | note:c s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 17/8 → 35/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 35/16 → 9/4 | note:c4 s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 9/4 → 37/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 37/16 → 19/8 | note:c s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 19/8 → 39/16 | note:c# s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 39/16 → 5/2 | note:c s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 5/2 → 41/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 41/16 → 21/8 | note:c4 s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 21/8 → 43/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 43/16 → 11/4 | note:c s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 11/4 → 45/16 | note:c# s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 45/16 → 23/8 | note:c s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 23/8 → 47/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 47/16 → 3/1 | note:c4 s:sawtooth cutoff:600 hpdepthfrequency:100 ]",
-  "[ 3/1 → 49/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 49/16 → 25/8 | note:c s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 25/8 → 51/16 | note:c# s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 51/16 → 13/4 | note:c s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 13/4 → 53/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 53/16 → 27/8 | note:c4 s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 27/8 → 55/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 55/16 → 7/2 | note:c s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 7/2 → 57/16 | note:c# s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 57/16 → 29/8 | note:c s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 29/8 → 59/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 59/16 → 15/4 | note:c4 s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 15/4 → 61/16 | note:c s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 61/16 → 31/8 | note:c s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 31/8 → 63/16 | note:c# s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-  "[ 63/16 → 4/1 | note:c s:sawtooth cutoff:600 hpdepthfrequency:0 ]",
-]
-`;
-
 exports[`runs examples > example "hpenv" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:c2 s:sawtooth hcutoff:500 hpattack:0.5 hpenv:4 ]",
@@ -6107,144 +5969,6 @@ exports[`runs examples > example "lpdecay" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "lpdepth" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | note:c s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 1/16 → 1/8 | note:c s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 1/8 → 3/16 | note:c# s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 3/16 → 1/4 | note:c s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 1/4 → 5/16 | note:c s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 5/16 → 3/8 | note:c4 s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 3/8 → 7/16 | note:c s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 7/16 → 1/2 | note:c s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 1/2 → 9/16 | note:c# s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 9/16 → 5/8 | note:c s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 5/8 → 11/16 | note:c s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 11/16 → 3/4 | note:c4 s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 3/4 → 13/16 | note:c s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 13/16 → 7/8 | note:c s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 7/8 → 15/16 | note:c# s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 15/16 → 1/1 | note:c s:sawtooth cutoff:600 lpdepth:1 ]",
-  "[ 1/1 → 17/16 | note:c s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 17/16 → 9/8 | note:c4 s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 9/8 → 19/16 | note:c s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 19/16 → 5/4 | note:c s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 5/4 → 21/16 | note:c# s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 21/16 → 11/8 | note:c s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 11/8 → 23/16 | note:c s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 23/16 → 3/2 | note:c4 s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 3/2 → 25/16 | note:c s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 25/16 → 13/8 | note:c s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 13/8 → 27/16 | note:c# s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 27/16 → 7/4 | note:c s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 7/4 → 29/16 | note:c s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 29/16 → 15/8 | note:c4 s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 15/8 → 31/16 | note:c s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 31/16 → 2/1 | note:c s:sawtooth cutoff:600 lpdepth:0.5 ]",
-  "[ 2/1 → 33/16 | note:c# s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 33/16 → 17/8 | note:c s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 17/8 → 35/16 | note:c s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 35/16 → 9/4 | note:c4 s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 9/4 → 37/16 | note:c s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 37/16 → 19/8 | note:c s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 19/8 → 39/16 | note:c# s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 39/16 → 5/2 | note:c s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 5/2 → 41/16 | note:c s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 41/16 → 21/8 | note:c4 s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 21/8 → 43/16 | note:c s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 43/16 → 11/4 | note:c s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 11/4 → 45/16 | note:c# s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 45/16 → 23/8 | note:c s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 23/8 → 47/16 | note:c s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 47/16 → 3/1 | note:c4 s:sawtooth cutoff:600 lpdepth:1.8 ]",
-  "[ 3/1 → 49/16 | note:c s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 49/16 → 25/8 | note:c s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 25/8 → 51/16 | note:c# s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 51/16 → 13/4 | note:c s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 13/4 → 53/16 | note:c s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 53/16 → 27/8 | note:c4 s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 27/8 → 55/16 | note:c s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 55/16 → 7/2 | note:c s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 7/2 → 57/16 | note:c# s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 57/16 → 29/8 | note:c s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 29/8 → 59/16 | note:c s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 59/16 → 15/4 | note:c4 s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 15/4 → 61/16 | note:c s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 61/16 → 31/8 | note:c s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 31/8 → 63/16 | note:c# s:sawtooth cutoff:600 lpdepth:0 ]",
-  "[ 63/16 → 4/1 | note:c s:sawtooth cutoff:600 lpdepth:0 ]",
-]
-`;
-
-exports[`runs examples > example "lpdepthfrequency" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 1/16 → 1/8 | note:c s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 1/8 → 3/16 | note:c# s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 3/16 → 1/4 | note:c s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 1/4 → 5/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 5/16 → 3/8 | note:c4 s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 3/8 → 7/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 7/16 → 1/2 | note:c s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 1/2 → 9/16 | note:c# s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 9/16 → 5/8 | note:c s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 5/8 → 11/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 11/16 → 3/4 | note:c4 s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 3/4 → 13/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 13/16 → 7/8 | note:c s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 7/8 → 15/16 | note:c# s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 15/16 → 1/1 | note:c s:sawtooth cutoff:600 lpdepthfrequency:200 ]",
-  "[ 1/1 → 17/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 17/16 → 9/8 | note:c4 s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 9/8 → 19/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 19/16 → 5/4 | note:c s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 5/4 → 21/16 | note:c# s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 21/16 → 11/8 | note:c s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 11/8 → 23/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 23/16 → 3/2 | note:c4 s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 3/2 → 25/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 25/16 → 13/8 | note:c s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 13/8 → 27/16 | note:c# s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 27/16 → 7/4 | note:c s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 7/4 → 29/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 29/16 → 15/8 | note:c4 s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 15/8 → 31/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 31/16 → 2/1 | note:c s:sawtooth cutoff:600 lpdepthfrequency:500 ]",
-  "[ 2/1 → 33/16 | note:c# s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 33/16 → 17/8 | note:c s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 17/8 → 35/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 35/16 → 9/4 | note:c4 s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 9/4 → 37/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 37/16 → 19/8 | note:c s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 19/8 → 39/16 | note:c# s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 39/16 → 5/2 | note:c s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 5/2 → 41/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 41/16 → 21/8 | note:c4 s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 21/8 → 43/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 43/16 → 11/4 | note:c s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 11/4 → 45/16 | note:c# s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 45/16 → 23/8 | note:c s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 23/8 → 47/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 47/16 → 3/1 | note:c4 s:sawtooth cutoff:600 lpdepthfrequency:100 ]",
-  "[ 3/1 → 49/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 49/16 → 25/8 | note:c s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 25/8 → 51/16 | note:c# s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 51/16 → 13/4 | note:c s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 13/4 → 53/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 53/16 → 27/8 | note:c4 s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 27/8 → 55/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 55/16 → 7/2 | note:c s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 7/2 → 57/16 | note:c# s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 57/16 → 29/8 | note:c s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 29/8 → 59/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 59/16 → 15/4 | note:c4 s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 15/4 → 61/16 | note:c s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 61/16 → 31/8 | note:c s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 31/8 → 63/16 | note:c# s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-  "[ 63/16 → 4/1 | note:c s:sawtooth cutoff:600 lpdepthfrequency:0 ]",
-]
-`;
-
 exports[`runs examples > example "lpenv" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:c2 s:sawtooth cutoff:300 lpattack:0.5 lpenv:4 ]",
@@ -6433,75 +6157,6 @@ exports[`runs examples > example "lpq" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "lprate" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | note:c s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 1/16 → 1/8 | note:c s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 1/8 → 3/16 | note:c# s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 3/16 → 1/4 | note:c s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 1/4 → 5/16 | note:c s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 5/16 → 3/8 | note:c4 s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 3/8 → 7/16 | note:c s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 7/16 → 1/2 | note:c s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 1/2 → 9/16 | note:c# s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 9/16 → 5/8 | note:c s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 5/8 → 11/16 | note:c s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 11/16 → 3/4 | note:c4 s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 3/4 → 13/16 | note:c s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 13/16 → 7/8 | note:c s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 7/8 → 15/16 | note:c# s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 15/16 → 1/1 | note:c s:sawtooth cutoff:600 lprate:4 ]",
-  "[ 1/1 → 17/16 | note:c s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 17/16 → 9/8 | note:c4 s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 9/8 → 19/16 | note:c s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 19/16 → 5/4 | note:c s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 5/4 → 21/16 | note:c# s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 21/16 → 11/8 | note:c s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 11/8 → 23/16 | note:c s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 23/16 → 3/2 | note:c4 s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 3/2 → 25/16 | note:c s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 25/16 → 13/8 | note:c s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 13/8 → 27/16 | note:c# s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 27/16 → 7/4 | note:c s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 7/4 → 29/16 | note:c s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 29/16 → 15/8 | note:c4 s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 15/8 → 31/16 | note:c s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 31/16 → 2/1 | note:c s:sawtooth cutoff:600 lprate:8 ]",
-  "[ 2/1 → 33/16 | note:c# s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 33/16 → 17/8 | note:c s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 17/8 → 35/16 | note:c s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 35/16 → 9/4 | note:c4 s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 9/4 → 37/16 | note:c s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 37/16 → 19/8 | note:c s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 19/8 → 39/16 | note:c# s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 39/16 → 5/2 | note:c s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 5/2 → 41/16 | note:c s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 41/16 → 21/8 | note:c4 s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 21/8 → 43/16 | note:c s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 43/16 → 11/4 | note:c s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 11/4 → 45/16 | note:c# s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 45/16 → 23/8 | note:c s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 23/8 → 47/16 | note:c s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 47/16 → 3/1 | note:c4 s:sawtooth cutoff:600 lprate:2 ]",
-  "[ 3/1 → 49/16 | note:c s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 49/16 → 25/8 | note:c s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 25/8 → 51/16 | note:c# s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 51/16 → 13/4 | note:c s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 13/4 → 53/16 | note:c s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 53/16 → 27/8 | note:c4 s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 27/8 → 55/16 | note:c s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 55/16 → 7/2 | note:c s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 7/2 → 57/16 | note:c# s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 57/16 → 29/8 | note:c s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 29/8 → 59/16 | note:c s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 59/16 → 15/4 | note:c4 s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 15/4 → 61/16 | note:c s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 61/16 → 31/8 | note:c s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 31/8 → 63/16 | note:c# s:sawtooth cutoff:600 lprate:1 ]",
-  "[ 63/16 → 4/1 | note:c s:sawtooth cutoff:600 lprate:1 ]",
-]
-`;
-
 exports[`runs examples > example "lprelease" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:c2 s:sawtooth clip:0.5 cutoff:300 lpenv:4 lprelease:0.5 release:0.5 ]",
@@ -6544,75 +6199,6 @@ exports[`runs examples > example "lpsustain" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "lpsync" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | note:c s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 1/16 → 1/8 | note:c s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 1/8 → 3/16 | note:c# s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 3/16 → 1/4 | note:c s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 1/4 → 5/16 | note:c s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 5/16 → 3/8 | note:c4 s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 3/8 → 7/16 | note:c s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 7/16 → 1/2 | note:c s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 1/2 → 9/16 | note:c# s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 9/16 → 5/8 | note:c s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 5/8 → 11/16 | note:c s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 11/16 → 3/4 | note:c4 s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 3/4 → 13/16 | note:c s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 13/16 → 7/8 | note:c s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 7/8 → 15/16 | note:c# s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 15/16 → 1/1 | note:c s:sawtooth cutoff:600 lpsync:4 ]",
-  "[ 1/1 → 17/16 | note:c s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 17/16 → 9/8 | note:c4 s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 9/8 → 19/16 | note:c s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 19/16 → 5/4 | note:c s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 5/4 → 21/16 | note:c# s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 21/16 → 11/8 | note:c s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 11/8 → 23/16 | note:c s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 23/16 → 3/2 | note:c4 s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 3/2 → 25/16 | note:c s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 25/16 → 13/8 | note:c s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 13/8 → 27/16 | note:c# s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 27/16 → 7/4 | note:c s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 7/4 → 29/16 | note:c s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 29/16 → 15/8 | note:c4 s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 15/8 → 31/16 | note:c s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 31/16 → 2/1 | note:c s:sawtooth cutoff:600 lpsync:8 ]",
-  "[ 2/1 → 33/16 | note:c# s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 33/16 → 17/8 | note:c s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 17/8 → 35/16 | note:c s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 35/16 → 9/4 | note:c4 s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 9/4 → 37/16 | note:c s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 37/16 → 19/8 | note:c s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 19/8 → 39/16 | note:c# s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 39/16 → 5/2 | note:c s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 5/2 → 41/16 | note:c s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 41/16 → 21/8 | note:c4 s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 21/8 → 43/16 | note:c s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 43/16 → 11/4 | note:c s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 11/4 → 45/16 | note:c# s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 45/16 → 23/8 | note:c s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 23/8 → 47/16 | note:c s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 47/16 → 3/1 | note:c4 s:sawtooth cutoff:600 lpsync:2 ]",
-  "[ 3/1 → 49/16 | note:c s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 49/16 → 25/8 | note:c s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 25/8 → 51/16 | note:c# s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 51/16 → 13/4 | note:c s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 13/4 → 53/16 | note:c s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 53/16 → 27/8 | note:c4 s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 27/8 → 55/16 | note:c s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 55/16 → 7/2 | note:c s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 7/2 → 57/16 | note:c# s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 57/16 → 29/8 | note:c s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 29/8 → 59/16 | note:c s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 59/16 → 15/4 | note:c4 s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 15/4 → 61/16 | note:c s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 61/16 → 31/8 | note:c s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 31/8 → 63/16 | note:c# s:sawtooth cutoff:600 lpsync:1 ]",
-  "[ 63/16 → 4/1 | note:c s:sawtooth cutoff:600 lpsync:1 ]",
-]
-`;
-
 exports[`runs examples > example "lrate" example index 0 1`] = `
 [
   "[ 0/1 → 1/1 | n:0 s:supersquare leslie:1 lrate:1 ]",
@@ -7302,18 +6888,18 @@ exports[`runs examples > example "nrpv" example index 0 1`] = `
 
 exports[`runs examples > example "octave" example index 0 1`] = `
 [
-  "[ 0/1 → 1/1 | note:F3 s:supersaw octave:0 ]",
+  "[ 0/1 → 1/1 | n:0 s:supersquare octave:3 ]",
-  "[ 0/1 → 1/1 | note:C4 s:supersaw octave:0 ]",
+  "[ 0/1 → 1/1 | n:4 s:supersquare octave:3 ]",
-  "[ 0/1 → 1/1 | note:F4 s:supersaw octave:0 ]",
+  "[ 0/1 → 1/1 | n:7 s:supersquare octave:3 ]",
-  "[ 1/1 → 2/1 | note:F3 s:supersaw octave:1 ]",
+  "[ 1/1 → 2/1 | n:0 s:supersquare octave:4 ]",
-  "[ 1/1 → 2/1 | note:C4 s:supersaw octave:1 ]",
+  "[ 1/1 → 2/1 | n:4 s:supersquare octave:4 ]",
-  "[ 1/1 → 2/1 | note:F4 s:supersaw octave:1 ]",
+  "[ 1/1 → 2/1 | n:7 s:supersquare octave:4 ]",
-  "[ 2/1 → 3/1 | note:F3 s:supersaw octave:2 ]",
+  "[ 2/1 → 3/1 | n:0 s:supersquare octave:5 ]",
-  "[ 2/1 → 3/1 | note:C4 s:supersaw octave:2 ]",
+  "[ 2/1 → 3/1 | n:4 s:supersquare octave:5 ]",
-  "[ 2/1 → 3/1 | note:F4 s:supersaw octave:2 ]",
+  "[ 2/1 → 3/1 | n:7 s:supersquare octave:5 ]",
-  "[ 3/1 → 4/1 | note:F3 s:supersaw octave:3 ]",
+  "[ 3/1 → 4/1 | n:0 s:supersquare octave:6 ]",
-  "[ 3/1 → 4/1 | note:C4 s:supersaw octave:3 ]",
+  "[ 3/1 → 4/1 | n:4 s:supersquare octave:6 ]",
-  "[ 3/1 → 4/1 | note:F4 s:supersaw octave:3 ]",
+  "[ 3/1 → 4/1 | n:7 s:supersquare octave:6 ]",
 ]
 `;
 
@@ -12898,54 +12484,54 @@ exports[`runs examples > example "wchooseCycles" example index 0 1`] = `
 
 exports[`runs examples > example "wchooseCycles" example index 1 1`] = `
 [
-  "[ 0/1 → 1/12 | note:c ]",
+  "[ 0/1 → 1/12 | s:bd ]",
-  "[ 1/12 → 1/6 | note:c ]",
+  "[ 1/12 → 1/6 | s:bd ]",
-  "[ 1/6 → 1/4 | note:c ]",
+  "[ 1/6 → 1/4 | s:bd ]",
-  "[ 1/4 → 1/3 | note:c ]",
+  "[ 1/4 → 1/3 | s:bd ]",
-  "[ 1/3 → 5/12 | note:c ]",
+  "[ 1/3 → 5/12 | s:bd ]",
-  "[ 5/12 → 1/2 | note:c ]",
+  "[ 5/12 → 1/2 | s:bd ]",
-  "[ 1/2 → 7/12 | note:f ]",
+  "[ 1/2 → 7/12 | s:sd ]",
-  "[ 7/12 → 2/3 | note:f ]",
+  "[ 7/12 → 2/3 | s:sd ]",
-  "[ 2/3 → 3/4 | note:f ]",
+  "[ 2/3 → 3/4 | s:sd ]",
-  "[ 3/4 → 5/6 | note:c ]",
+  "[ 3/4 → 5/6 | s:bd ]",
-  "[ 5/6 → 11/12 | note:c ]",
+  "[ 5/6 → 11/12 | s:bd ]",
-  "[ 11/12 → 1/1 | note:c ]",
+  "[ 11/12 → 1/1 | s:bd ]",
-  "[ 1/1 → 13/12 | note:c ]",
+  "[ 1/1 → 13/12 | s:bd ]",
-  "[ 13/12 → 7/6 | note:c ]",
+  "[ 13/12 → 7/6 | s:bd ]",
-  "[ 7/6 → 5/4 | note:c ]",
+  "[ 7/6 → 5/4 | s:bd ]",
-  "[ 5/4 → 4/3 | note:c ]",
+  "[ 5/4 → 4/3 | s:bd ]",
-  "[ 4/3 → 17/12 | note:c ]",
+  "[ 4/3 → 17/12 | s:bd ]",
-  "[ 17/12 → 3/2 | note:c ]",
+  "[ 17/12 → 3/2 | s:bd ]",
-  "[ 3/2 → 19/12 | note:a ]",
+  "[ 3/2 → 19/12 | s:hh ]",
-  "[ 19/12 → 5/3 | note:a ]",
+  "[ 19/12 → 5/3 | s:hh ]",
-  "[ 5/3 → 7/4 | note:a ]",
+  "[ 5/3 → 7/4 | s:hh ]",
-  "[ 7/4 → 11/6 | note:c ]",
+  "[ 7/4 → 11/6 | s:bd ]",
-  "[ 11/6 → 23/12 | note:c ]",
+  "[ 11/6 → 23/12 | s:bd ]",
-  "[ 23/12 → 2/1 | note:c ]",
+  "[ 23/12 → 2/1 | s:bd ]",
-  "[ 2/1 → 25/12 | note:a ]",
+  "[ 2/1 → 25/12 | s:hh ]",
-  "[ 25/12 → 13/6 | note:a ]",
+  "[ 25/12 → 13/6 | s:hh ]",
-  "[ 13/6 → 9/4 | note:a ]",
+  "[ 13/6 → 9/4 | s:hh ]",
-  "[ 9/4 → 7/3 | note:a ]",
+  "[ 9/4 → 7/3 | s:hh ]",
-  "[ 7/3 → 29/12 | note:a ]",
+  "[ 7/3 → 29/12 | s:hh ]",
-  "[ 29/12 → 5/2 | note:a ]",
+  "[ 29/12 → 5/2 | s:hh ]",
-  "[ 5/2 → 31/12 | note:c ]",
+  "[ 5/2 → 31/12 | s:bd ]",
-  "[ 31/12 → 8/3 | note:c ]",
+  "[ 31/12 → 8/3 | s:bd ]",
-  "[ 8/3 → 11/4 | note:c ]",
+  "[ 8/3 → 11/4 | s:bd ]",
-  "[ 11/4 → 17/6 | note:c ]",
+  "[ 11/4 → 17/6 | s:bd ]",
-  "[ 17/6 → 35/12 | note:c ]",
+  "[ 17/6 → 35/12 | s:bd ]",
-  "[ 35/12 → 3/1 | note:c ]",
+  "[ 35/12 → 3/1 | s:bd ]",
-  "[ 3/1 → 37/12 | note:c ]",
+  "[ 3/1 → 37/12 | s:bd ]",
-  "[ 37/12 → 19/6 | note:c ]",
+  "[ 37/12 → 19/6 | s:bd ]",
-  "[ 19/6 → 13/4 | note:c ]",
+  "[ 19/6 → 13/4 | s:bd ]",
-  "[ 13/4 → 10/3 | note:f ]",
+  "[ 13/4 → 10/3 | s:sd ]",
-  "[ 10/3 → 41/12 | note:f ]",
+  "[ 10/3 → 41/12 | s:sd ]",
-  "[ 41/12 → 7/2 | note:f ]",
+  "[ 41/12 → 7/2 | s:sd ]",
-  "[ 7/2 → 43/12 | note:a ]",
+  "[ 7/2 → 43/12 | s:hh ]",
-  "[ 43/12 → 11/3 | note:a ]",
+  "[ 43/12 → 11/3 | s:hh ]",
-  "[ 11/3 → 15/4 | note:a ]",
+  "[ 11/3 → 15/4 | s:hh ]",
-  "[ 15/4 → 23/6 | note:c ]",
+  "[ 15/4 → 23/6 | s:bd ]",
-  "[ 23/6 → 47/12 | note:c ]",
+  "[ 23/6 → 47/12 | s:bd ]",
-  "[ 47/12 → 4/1 | note:c ]",
+  "[ 47/12 → 4/1 | s:bd ]",
 ]
 `;
 

website/src/repl/components/button/action-button.jsx

@@ -8,34 +8,3 @@ export function ActionButton({ children, label, labelIsHidden, className, ...but
     </button>
   );
 }
-
-export function SpecialActionButton(props) {
-  const { className, ...buttonProps } = props;
-
-  return (
-    <ActionButton
-      {...buttonProps}
-      className={cx('bg-background p-2 max-w-[300px] rounded-md hover:opacity-50', className)}
-    />
-  );
-}
-
-export function ActionInput({ label, className, ...props }) {
-  return (
-    <label className={cx('inline-flex items-center cursor-pointer', className)}>
-      <input {...props} className="sr-only peer" />
-
-      <span className="inline-flex items-center peer-hover:opacity-50">{label}</span>
-    </label>
-  );
-}
-
-export function SpecialActionInput({ className, ...props }) {
-  return (
-    <ActionInput
-      {...props}
-      className={className}
-      label={<span className="bg-background p-2 max-w-[300px] rounded-md">{props.label}</span>}
-    />
-  );
-}

website/src/repl/components/panel/ImportPrebakeScriptButton.jsx

@@ -1,29 +0,0 @@
-import { errorLogger } from '@strudel/core';
-import { useSettings, storePrebakeScript } from '../../../settings.mjs';
-import { SpecialActionInput } from '../button/action-button';
-
-async function importScript(script) {
-  const reader = new FileReader();
-  reader.readAsText(script);
-
-  reader.onload = () => {
-    const text = reader.result;
-    storePrebakeScript(text);
-  };
-
-  reader.onerror = () => {
-    errorLogger(new Error('failed to import prebake script'), 'importScript');
-  };
-}
-export function ImportPrebakeScriptButton() {
-  const settings = useSettings();
-
-  return (
-    <SpecialActionInput
-      type="file"
-      label="import prebake script"
-      accept=".strudel"
-      onChange={(e) => importScript(e.target.files[0])}
-    />
-  );
-}

website/src/repl/components/panel/SettingsTab.jsx

@@ -7,8 +7,6 @@ import { AudioDeviceSelector } from './AudioDeviceSelector.jsx';
 import { AudioEngineTargetSelector } from './AudioEngineTargetSelector.jsx';
 import { confirmDialog } from '../../util.mjs';
 import { DEFAULT_MAX_POLYPHONY, setMaxPolyphony, setMultiChannelOrbits } from '@strudel/webaudio';
-import { ActionButton, SpecialActionButton } from '../button/action-button.jsx';
-import { ImportPrebakeScriptButton } from './ImportPrebakeScriptButton.jsx';
 
 function Checkbox({ label, value, onChange, disabled = false }) {
   return (
@@ -115,7 +113,6 @@ export function SettingsTab({ started }) {
     isTabIndentationEnabled,
     isMultiCursorEnabled,
     patternAutoStart,
-    includePrebakeScriptInShare,
   } = useSettings();
   const shouldAlwaysSync = isUdels();
   const canChangeAudioDevice = AudioContext.prototype.setSinkId != null;
@@ -207,15 +204,6 @@ export function SettingsTab({ started }) {
           />
         </FormItem>
       </div>
-      <FormItem label="Prebake">
-        <ImportPrebakeScriptButton />
-        <Checkbox
-          label="Include prebake script in share"
-          onChange={(cbEvent) => settingsMap.setKey('includePrebakeScriptInShare', cbEvent.target.checked)}
-          value={includePrebakeScriptInShare}
-        />
-      </FormItem>
-
       <FormItem label="Keybindings">
         <ButtonGroup
           value={keybindings}
@@ -325,7 +313,8 @@ export function SettingsTab({ started }) {
       </FormItem>
       <FormItem label="Zen Mode">Try clicking the logo in the top left!</FormItem>
       <FormItem label="Reset Settings">
-        <SpecialActionButton
+        <button
+          className="bg-background p-2 max-w-[300px] rounded-md hover:opacity-50"
           onClick={() => {
             confirmDialog('Sure?').then((r) => {
               if (r) {
@@ -336,7 +325,7 @@ export function SettingsTab({ started }) {
           }}
         >
           restore default settings
-        </SpecialActionButton>
+        </button>
       </FormItem>
     </div>
   );

website/src/repl/components/panel/SoundsTab.jsx

@@ -126,7 +126,7 @@ export function SoundsTab() {
                 try {
                   // Pre-load the sample by calling onTrigger with a future time
                   // This triggers the loading but schedules playback for later
-                  const time = ctx.currentTime + 0.05;
+                  const time = ctx.currentTime + 0.5; // Give 500ms for loading
                   const ref = await onTrigger(time, params, onended);
                   trigRef.current = ref;
                   if (ref?.node) {

website/src/repl/prebake.mjs

@@ -3,8 +3,6 @@ import { aliasBank, registerSynthSounds, registerZZFXSounds, samples } from '@st
 import { registerSamplesFromDB } from './idbutils.mjs';
 import './piano.mjs';
 import './files.mjs';
-import { settingsMap } from '@src/settings.mjs';
-import { evaluate } from '@strudel/transpiler';
 
 const { BASE_URL } = import.meta.env;
 const baseNoTrailing = BASE_URL.endsWith('/') ? BASE_URL.slice(0, -1) : BASE_URL;

website/src/repl/useReplContext.jsx

@@ -6,7 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import { code2hash, getPerformanceTimeSeconds, logger, silence } from '@strudel/core';
 import { getDrawContext } from '@strudel/draw';
-import { evaluate, transpiler } from '@strudel/transpiler';
+import { transpiler } from '@strudel/transpiler';
 import {
   getAudioContextCurrentTime,
   webaudioOutput,
@@ -63,10 +63,11 @@ async function getModule(name) {
 const initialCode = `// LOADING`;
 
 export function useReplContext() {
-  const { isSyncEnabled, audioEngineTarget, prebakeScript, includePrebakeScriptInShare } = useSettings();
+  const { isSyncEnabled, audioEngineTarget } = useSettings();
   const shouldUseWebaudio = audioEngineTarget !== audioEngineTargets.osc;
   const defaultOutput = shouldUseWebaudio ? webaudioOutput : superdirtOutput;
   const getTime = shouldUseWebaudio ? getAudioContextCurrentTime : getPerformanceTimeSeconds;
+
   const init = useCallback(() => {
     const drawTime = [-2, 2];
     const drawContext = getDrawContext();
@@ -83,12 +84,7 @@ export function useReplContext() {
       pattern: silence,
       drawTime,
       drawContext,
-      prebake: async () =>
+      prebake: async () => Promise.all([modulesLoading, presets]),
-        Promise.all([modulesLoading, presets]).then(() => {
-          if (prebakeScript?.length) {
-            return evaluate(prebakeScript ?? '');
-          }
-        }),
       onUpdateState: (state) => {
         setReplState({ ...state });
       },
@@ -218,13 +214,7 @@ export function useReplContext() {
     editorRef.current.repl.evaluate(code);
   };
 
-  const handleShare = async () => {
+  const handleShare = async () => shareCode(replState.code);
-    let code = replState.code;
-    if (includePrebakeScriptInShare) {
-      code = prebakeScript + '\n' + code;
-    }
-    shareCode(code);
-  };
   const context = {
     started,
     pending,

website/src/repl/util.mjs

@@ -1,10 +1,11 @@
-import { code2hash, evalScope, hash2code, logger } from '@strudel/core';
+import { evalScope, hash2code, logger } from '@strudel/core';
 import { settingPatterns } from '../settings.mjs';
 import { setVersionDefaults } from '@strudel/webaudio';
 import { getMetadata } from '../metadata_parser';
 import { isTauri } from '../tauri.mjs';
 import './Repl.css';
 import { createClient } from '@supabase/supabase-js';
+import { nanoid } from 'nanoid';
 import { writeText } from '@tauri-apps/plugin-clipboard-manager';
 import { $featuredPatterns /* , loadDBPatterns */ } from '@src/user_pattern_utils.mjs';
 
@@ -108,8 +109,9 @@ export function confirmDialog(msg) {
   });
 }
 
+let lastShared;
+
 //RIP due to SPAM
-// let lastShared;
 // export async function shareCode(codeToShare) {
 //   // const codeToShare = activeCode || code;
 //   if (lastShared === codeToShare) {
@@ -144,10 +146,9 @@ export function confirmDialog(msg) {
 //   });
 // }
 
-export async function shareCode(codeToShare) {
+export async function shareCode() {
   try {
-    const hash = '#' + code2hash(codeToShare);
+    const shareUrl = window.location.href;
-    const shareUrl = window.location.origin + window.location.pathname + hash;
     if (isTauri()) {
       await writeText(shareUrl);
     } else {

website/src/settings.mjs

@@ -45,13 +45,11 @@ export const defaultSettings = {
   isPanelOpen: true,
   togglePanelTrigger: 'click', //click | hover
   userPatterns: '{}',
-  prebakeScript: '',
   audioEngineTarget: audioEngineTargets.webaudio,
   isButtonRowHidden: false,
   isCSSAnimationDisabled: false,
   maxPolyphony: 128,
   multiChannelOrbits: false,
-  includePrebakeScriptInShare: true,
 };
 
 let search = null;
@@ -98,7 +96,6 @@ export function useSettings() {
     isPanelOpen: parseBoolean(state.isPanelOpen),
     userPatterns: userPatterns,
     multiChannelOrbits: parseBoolean(state.multiChannelOrbits),
-    includePrebakeScriptInShare: parseBoolean(state.includePrebakeScriptInShare),
     patternAutoStart: isUdels()
       ? false
       : state.patternAutoStart === undefined
@@ -111,8 +108,6 @@ export const setActiveFooter = (tab) => settingsMap.setKey('activeFooter', tab);
 export const setPanelPinned = (bool) => settingsMap.setKey('isPanelPinned', bool);
 export const setIsPanelOpened = (bool) => settingsMap.setKey('isPanelOpen', bool);
 
-export const storePrebakeScript = (script) => settingsMap.setKey('prebakeScript', script);
-
 export const setIsZen = (active) => settingsMap.setKey('isZen', !!active);
 
 const patternSetting = (key) =>