From 483843bd0a776ff0690712b5495499a0535c2c1f Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sun, 1 Jun 2025 18:06:36 +0200
Subject: [PATCH 01/52] begin supradough

---
 packages/superdough/dough.mjs    | 445 +++++++++++++++++++++++++++++++
 packages/superdough/synth.mjs    |   4 +-
 packages/superdough/worklets.mjs |  53 ++++
 packages/webaudio/supradough.mjs |  39 +++
 4 files changed, 539 insertions(+), 2 deletions(-)
 create mode 100644 packages/superdough/dough.mjs
 create mode 100644 packages/webaudio/supradough.mjs

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
new file mode 100644
index 000000000..f3365b06c
--- /dev/null
+++ b/packages/superdough/dough.mjs
@@ -0,0 +1,445 @@
+// this is dough, the superdough without dependencies
+
+const ISR = 1 / sampleRate;
+// https://garten.salat.dev/audio-DSP/oscillators.html
+export class SineOsc {
+  phase = 0;
+  update(freq) {
+    const value = Math.sin(this.phase * 2 * Math.PI);
+    this.phase = (this.phase + freq / sampleRate) % 1;
+    return value;
+  }
+}
+
+export class ZawOsc {
+  phase = 0;
+  update(freq) {
+    this.phase += ISR * freq;
+    return (this.phase % 1) * 2 - 1;
+  }
+}
+
+function polyBlep(t, dt) {
+  // 0 <= t < 1
+  if (t < dt) {
+    t /= dt;
+    // 2 * (t - t^2/2 - 0.5)
+    return t + t - t * t - 1;
+  }
+  // -1 < t < 0
+  if (t > 1 - dt) {
+    t = (t - 1) / dt;
+    // 2 * (t^2/2 + t + 0.5)
+    return t * t + t + t + 1;
+  }
+  // 0 otherwise
+  return 0;
+}
+export class SawOsc {
+  //phase = Math.random();
+  phase = 0;
+  update(freq) {
+    const dt = freq / sampleRate;
+    let p = polyBlep(this.phase, dt);
+    let s = 2 * this.phase - 1 - p;
+    this.phase += dt;
+    if (this.phase > 1) {
+      this.phase -= 1;
+    }
+    return s;
+  }
+}
+
+export class TriOsc {
+  phase = 0;
+  update(freq) {
+    this.phase += ISR * freq;
+    let phase = this.phase % 1;
+    let value = phase < 0.5 ? 2 * phase : 1 - 2 * (phase - 0.5);
+    return value * 2 - 1;
+  }
+}
+
+export class Lpf {
+  s0 = 0;
+  s1 = 0;
+  update(s, cutoff, resonance = 0) {
+    // Out of bound values can produce NaNs
+    cutoff = Math.min(cutoff, 1);
+    resonance = Math.max(resonance, 0);
+    var c = Math.pow(0.5, (1 - cutoff) / 0.125);
+    var r = Math.pow(0.5, (resonance + 0.125) / 0.125);
+    var mrc = 1 - r * c;
+    var v0 = this.s0;
+    var v1 = this.s1;
+    // Apply the filter to the sample
+    v0 = mrc * v0 - c * v1 + c * s;
+    v1 = mrc * v1 + c * v0;
+    s = v1;
+    this.s0 = v0;
+    this.s1 = v1;
+    return s;
+  }
+}
+
+export class PulseOsc {
+  phase = 0;
+  update(freq, duty = 0.5) {
+    this.phase += ISR * freq;
+    let cyclePos = this.phase % 1;
+    return cyclePos < duty ? 1 : -1;
+  }
+}
+
+export class Dust {
+  update = (density) => (Math.random() < density * ISR ? Math.random() : 0);
+}
+
+export class Impulse {
+  phase = 1;
+  update(freq) {
+    this.phase += ISR * freq;
+    let v = this.phase >= 1 ? 1 : 0;
+    this.phase = this.phase % 1;
+    return v;
+  }
+}
+
+export class ClockDiv {
+  inSgn = true;
+  outSgn = true;
+  clockCnt = 0;
+  update(clock, factor) {
+    let curSgn = clock > 0;
+    if (this.inSgn != curSgn) {
+      this.clockCnt++;
+      if (this.clockCnt >= factor) {
+        this.clockCnt = 0;
+        this.outSgn = !this.outSgn;
+      }
+    }
+
+    this.inSgn = curSgn;
+    return this.outSgn ? 1 : -1;
+  }
+}
+
+export class Hold {
+  value = 0;
+  trigSgn = false;
+  update(input, trig) {
+    if (!this.trigSgn && trig > 0) this.value = input;
+    this.trigSgn = trig > 0;
+    return this.value;
+  }
+}
+
+function lerp(x, y0, y1) {
+  if (x >= 1) return y1;
+
+  return y0 + x * (y1 - y0);
+}
+
+export class ADSR {
+  state = 'off';
+  startTime = 0;
+  startVal = 0;
+
+  update(curTime, gate, attack, decay, susVal, release) {
+    switch (this.state) {
+      case 'off': {
+        if (gate > 0) {
+          this.state = 'attack';
+          this.startTime = curTime;
+          this.startVal = 0;
+        }
+        return 0;
+      }
+      case 'attack': {
+        let time = curTime - this.startTime;
+        if (time > attack) {
+          this.state = 'decay';
+          this.startTime = curTime;
+          return 1;
+        }
+        return lerp(time / attack, this.startVal, 1);
+      }
+      case 'decay': {
+        let time = curTime - this.startTime;
+        let curVal = lerp(time / decay, 1, susVal);
+        if (gate <= 0) {
+          this.state = 'release';
+          this.startTime = curTime;
+          this.startVal = curVal;
+          return curVal;
+        }
+        if (time > decay) {
+          this.state = 'sustain';
+          this.startTime = curTime;
+          return susVal;
+        }
+        return curVal;
+      }
+      case 'sustain': {
+        if (gate <= 0) {
+          this.state = 'release';
+          this.startTime = curTime;
+          this.startVal = susVal;
+        }
+        return susVal;
+      }
+      case 'release': {
+        let time = curTime - this.startTime;
+        if (time > release) {
+          this.state = 'off';
+          return 0;
+        }
+        let curVal = lerp(time / release, this.startVal, 0);
+        if (gate > 0) {
+          this.state = 'attack';
+          this.startTime = curTime;
+          this.startVal = curVal;
+        }
+        return curVal;
+      }
+    }
+    throw 'invalid envelope state';
+  }
+}
+
+/*
+        impulse(1).ad(.1).mul(sine(200))
+.add(x=>x.delay(.1).mul(.8))
+.out()*/
+const MAX_DELAY_TIME = 10;
+export class Delay {
+  writeIdx = 0;
+  readIdx = 0;
+  buffer = new Float32Array(MAX_DELAY_TIME * sampleRate); // .fill(0)
+  write(s, delayTime) {
+    this.writeIdx = (this.writeIdx + 1) % this.buffer.length;
+    this.buffer[this.writeIdx] = s;
+    // Calculate how far in the past to read
+    let numSamples = Math.min(Math.floor(sampleRate * delayTime), this.buffer.length - 1);
+    this.readIdx = this.writeIdx - numSamples;
+    // If past the start of the buffer, wrap around
+    if (this.readIdx < 0) this.readIdx += this.buffer.length;
+  }
+  update(input, delayTime) {
+    this.write(input, delayTime);
+    return this.buffer[this.readIdx];
+  }
+}
+
+export class Fold {
+  update(input = 0, rate = 0) {
+    if (rate < 0) rate = 0;
+    rate = rate + 1;
+    input = input * rate;
+    return 4 * (Math.abs(0.25 * input + 0.25 - Math.round(0.25 * input + 0.25)) - 0.25);
+  }
+}
+
+export class Lag {
+  lagUnit = 4410;
+  s = 0;
+  update(input, rate) {
+    // Remap so the useful range is around [0, 1]
+    rate = rate * this.lagUnit;
+    if (rate < 1) rate = 1;
+    this.s += (1 / rate) * (input - this.s);
+    return this.s;
+  }
+}
+
+export class Slew {
+  last = 0;
+  update(input, up, dn) {
+    const upStep = up * ISR;
+    const downStep = dn * ISR;
+    let delta = input - this.last;
+    if (delta > upStep) {
+      delta = upStep;
+    } else if (delta < -downStep) {
+      delta = -downStep;
+    }
+    this.last += delta;
+    return this.last;
+  }
+}
+
+export function applyDistortion(x, amount) {
+  amount = Math.min(Math.max(amount, 0), 1);
+  amount -= 0.01;
+  var k = (2 * amount) / (1 - amount);
+  var y = ((1 + k) * x) / (1 + k * Math.abs(x));
+  return y;
+}
+
+export class Sequence {
+  clockSgn = true;
+  step = 0;
+  first = true;
+  update(clock, ...ins) {
+    if (!this.clockSgn && clock > 0) {
+      this.step = (this.step + 1) % ins.length;
+      this.clockSgn = clock > 0;
+      return 0; // set first sample to zero to retrigger gates on step change...
+    }
+    this.clockSgn = clock > 0;
+    return ins[this.step];
+  }
+}
+
+export function _rangex(sig, min, max) {
+  let logmin = Math.log(min);
+  let range = Math.log(max) - logmin;
+  const unipolar = (sig + 1) / 2;
+  return Math.exp(unipolar * range + logmin);
+}
+
+// duplicate
+export const getADSRValues = (params, curve = 'linear', defaultValues) => {
+  const envmin = curve === 'exponential' ? 0.001 : 0.001;
+  const releaseMin = 0.01;
+  const envmax = 1;
+  const [a, d, s, r] = params;
+  if (a == null && d == null && s == null && r == null) {
+    return defaultValues ?? [envmin, envmin, envmax, releaseMin];
+  }
+  const sustain = s != null ? s : (a != null && d == null) || (a == null && d == null) ? envmax : envmin;
+  return [Math.max(a ?? 0, envmin), Math.max(d ?? 0, envmin), Math.min(sustain, envmax), Math.max(r ?? 0, releaseMin)];
+};
+let oscillators = {
+  sine: SineOsc,
+  saw: SawOsc,
+  zaw: ZawOsc,
+  sawtooth: SawOsc,
+  zawtooth: ZawOsc,
+  tri: TriOsc,
+  triangle: TriOsc,
+  pulse: PulseOsc,
+  dust: Dust,
+  impulse: Impulse,
+};
+
+const defaultDefaultValues = {
+  s: 'triangle',
+  gain: 0.8,
+  postgain: 1,
+  density: '.03',
+  ftype: '12db',
+  fanchor: 0,
+  resonance: 1,
+  hresonance: 1,
+  bandq: 1,
+  channels: [1, 2],
+  phaserdepth: 0.75,
+  shapevol: 1,
+  distortvol: 1,
+  delay: 0,
+  byteBeatExpression: '0',
+  delayfeedback: 0.5,
+  delaytime: 0.25,
+  orbit: 1,
+  i: 1,
+  velocity: 1,
+  fft: 8,
+  z: 'triangle',
+};
+
+let getDefaultValue = (key) => defaultDefaultValues[key];
+
+export class Dough {
+  init(value) {
+    // params without defaults:
+    /*
+    bank,
+    source,
+    cutoff,
+    lpenv,
+    lpattack,
+    lpdecay,
+    lpsustain,
+    lprelease,
+    hpenv,
+    hcutoff,
+    hpattack,
+    hpdecay,
+    hpsustain,
+    hprelease,
+    bpenv,
+    bandf,
+    bpattack,
+    bpdecay,
+    bpsustain,
+    bprelease,
+    phaserrate,
+    phasersweep,
+    phasercenter,
+    coarse,
+    crush,
+    shape,
+    distort,
+    pan,
+    vowel,
+    room,
+    roomfade,
+    roomlp,
+    roomdim,
+    roomsize,
+    ir,
+    analyze,
+    */
+    Object.assign(this, value);
+    // params with defaults:
+    this.s = this.s ?? getDefaultValue('s');
+    this.gain = this.gain ?? getDefaultValue('gain');
+    this.postgain = this.postgain ?? getDefaultValue('postgain');
+    this.density = this.density ?? getDefaultValue('density');
+    this.fanchor = this.fanchor ?? getDefaultValue('fanchor');
+    this.drive = this.drive ?? 0.69;
+    this.resonance = this.resonance ?? getDefaultValue('resonance');
+    this.hresonance = this.hresonance ?? getDefaultValue('hresonance');
+    this.bandq = this.bandq ?? getDefaultValue('bandq');
+    this.phaserdepth = this.phaserdepth ?? getDefaultValue('phaserdepth');
+    this.shapevol = this.shapevol ?? getDefaultValue('shapevol');
+    this.distortvol = this.distortvol ?? getDefaultValue('distortvol');
+    this.delay = this.delay ?? getDefaultValue('delay');
+    this.delayfeedback = this.delayfeedback ?? getDefaultValue('delayfeedback');
+    this.delaytime = this.delaytime ?? getDefaultValue('delaytime');
+    this.orbit = this.orbit ?? getDefaultValue('orbit');
+    this.i = this.i ?? getDefaultValue('i');
+    this.velocity = this.velocity ?? getDefaultValue('velocity');
+    this.fft = this.fft ?? getDefaultValue('fft');
+
+    [this.attack, this.decay, this.sustain, this.release] = getADSRValues([
+      this.attack,
+      this.decay,
+      this.sustain,
+      this.release,
+    ]);
+
+    const SourceClass = oscillators[this.s] ?? TriOsc;
+    this._sound = new SourceClass();
+    this._lpf = this.cutoff ? new Lpf() : null;
+    this._adsr = new ADSR();
+  }
+  update(t) {
+    if (!this._sound) {
+      return 0;
+    }
+    // sound source
+    let s = this._sound.update(this.freq);
+    // lpf
+    s = this._lpf ? this._lpf.update(s, this.cutoff, this.resonance) : s;
+    // not sure if gain is applied here
+    s = s * this.gain;
+    // envelope
+    let gate = Number(t >= this._begin && t <= this._end);
+    const env = this._adsr.update(t, gate, this.attack, this.decay, this.sustain, this.release);
+    s = s * env;
+    s = s * this.postgain;
+    return s;
+  }
+}
diff --git a/packages/superdough/synth.mjs b/packages/superdough/synth.mjs
index 834e54c6d..7d175d6c4 100644
--- a/packages/superdough/synth.mjs
+++ b/packages/superdough/synth.mjs
@@ -12,7 +12,7 @@ import {
 } from './helpers.mjs';
 import { getNoiseMix, getNoiseOscillator } from './noise.mjs';
 
-const getFrequencyFromValue = (value) => {
+export const getFrequencyFromValue = (value) => {
   let { note, freq } = value;
   note = note || 36;
   if (typeof note === 'string') {
@@ -25,7 +25,7 @@ const getFrequencyFromValue = (value) => {
 
   return Number(freq);
 };
-function destroyAudioWorkletNode(node) {
+export function destroyAudioWorkletNode(node) {
   if (node == null) {
     return;
   }
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 24f7434a9..43a21477b 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -4,6 +4,7 @@
 
 import OLAProcessor from './ola-processor';
 import FFT from './fft.js';
+import { Dough } from './dough.mjs';
 
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
 const _mod = (n, m) => ((n % m) + m) % m;
@@ -895,3 +896,55 @@ class ByteBeatProcessor extends AudioWorkletProcessor {
 }
 
 registerProcessor('byte-beat-processor', ByteBeatProcessor);
+
+class DoughProcessor extends AudioWorkletProcessor {
+  constructor() {
+    super();
+    this.dough = new Dough();
+    this.port.onmessage = (event) => this.dough.init(event.data);
+  }
+  static get parameterDescriptors() {
+    return [
+      {
+        name: 'begin',
+        defaultValue: 0,
+        max: Number.POSITIVE_INFINITY,
+        min: 0,
+      },
+      {
+        name: 'end',
+        defaultValue: 0,
+        max: Number.POSITIVE_INFINITY,
+        min: 0,
+      },
+    ];
+  }
+
+  process(inputs, outputs, params) {
+    if (this.disconnected) {
+      return false;
+    }
+    if (currentTime <= params.begin[0]) {
+      return true;
+    }
+    if (currentTime >= params.end[0]) {
+      return false;
+    }
+    if (this.t == null) {
+      this.t = params.begin[0] * sampleRate;
+    }
+    const output = outputs[0];
+    for (let i = 0; i < output[0].length; i++) {
+      const out = this.dough.update(currentTime);
+
+      for (let c = 0; c < output.length; c++) {
+        //prevent speaker blowout via clipping if threshold exceeds
+        output[c][i] = clamp(out, -1, 1);
+      }
+      this.t = this.t + 1;
+    }
+    return true; // keep the audio processing going
+  }
+}
+
+registerProcessor('dough-processor', DoughProcessor);
diff --git a/packages/webaudio/supradough.mjs b/packages/webaudio/supradough.mjs
new file mode 100644
index 000000000..514d5e606
--- /dev/null
+++ b/packages/webaudio/supradough.mjs
@@ -0,0 +1,39 @@
+import { Pattern } from '@strudel/core';
+import { connectToDestination, destroyAudioWorkletNode, getAudioContext } from 'superdough';
+
+Pattern.prototype.supradough = function () {
+  return this.onTrigger((_, hap, __, cps, begin) => {
+    const { value } = hap;
+    value.freq = getFrequencyFromValue(hap.value);
+    const ac = getAudioContext();
+
+    const release = getADSRValues(
+      [value.attack, value.decay, value.sustain, value.release],
+      'linear',
+      [0.001, 0.05, 0.6, 0.01],
+    )[3];
+
+    const duration = hap.duration / cps;
+    const holdend = begin + duration;
+    const end = holdend + release + 0.01;
+    value._begin = begin; // these are needed for the gate signal
+    value._end = end;
+
+    let o = getWorklet(
+      ac,
+      'dough-processor',
+      {
+        begin, // we might not need these, as we could send them via postMessage below
+        end,
+      },
+      {
+        outputChannelCount: [2],
+      },
+    );
+
+    o.port.postMessage(value); // send value to worklet
+    let timeoutNode = webAudioTimeout(ac, () => destroyAudioWorkletNode(o), begin, end);
+    timeoutNode.stop(end + 0.125);
+    connectToDestination(o); // channels?
+  }, 1);
+};

From 5336569c25dfa0440396a61cc919d7b2cd29af70 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sun, 1 Jun 2025 21:20:28 +0200
Subject: [PATCH 02/52] proper lpf mapping + remove redundant worklet params,

---
 packages/superdough/dough.mjs    | 19 ++++++++++++++---
 packages/superdough/worklets.mjs | 36 +++++++++++---------------------
 packages/webaudio/supradough.mjs |  5 +----
 packages/webaudio/webaudio.mjs   |  1 +
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index f3365b06c..876cfdf11 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -351,7 +351,7 @@ const defaultDefaultValues = {
 let getDefaultValue = (key) => defaultDefaultValues[key];
 
 export class Dough {
-  init(value) {
+  init(value, sampleRate) {
     // params without defaults:
     /*
     bank,
@@ -424,6 +424,14 @@ export class Dough {
     this._sound = new SourceClass();
     this._lpf = this.cutoff ? new Lpf() : null;
     this._adsr = new ADSR();
+
+    this.piOverSr = Math.PI / sampleRate;
+    this.eighthOverLogHalf = 0.125 / Math.log(0.5);
+  }
+  // credits to pulu: https://github.com/felixroos/kabelsalat/issues/35
+  freq2cutoff(freq) {
+    const c = 2 * Math.sin(freq * this.piOverSr);
+    return 1 - Math.log(c) * this.eighthOverLogHalf;
   }
   update(t) {
     if (!this._sound) {
@@ -432,14 +440,19 @@ export class Dough {
     // sound source
     let s = this._sound.update(this.freq);
     // lpf
-    s = this._lpf ? this._lpf.update(s, this.cutoff, this.resonance) : s;
+    if (this._lpf) {
+      const cutoff = this.freq2cutoff(this.cutoff);
+      s = this._lpf ? this._lpf.update(s, cutoff, this.resonance) : s;
+    }
     // not sure if gain is applied here
     s = s * this.gain;
     // envelope
     let gate = Number(t >= this._begin && t <= this._end);
+    /* Math.random() > 0.99 && console.log('gate', gate); */
     const env = this._adsr.update(t, gate, this.attack, this.decay, this.sustain, this.release);
     s = s * env;
-    s = s * this.postgain;
+
+    s = s * this.postgain * 0.3;
     return s;
   }
 }
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 43a21477b..7633c6441 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -901,42 +901,30 @@ class DoughProcessor extends AudioWorkletProcessor {
   constructor() {
     super();
     this.dough = new Dough();
-    this.port.onmessage = (event) => this.dough.init(event.data);
-  }
-  static get parameterDescriptors() {
-    return [
-      {
-        name: 'begin',
-        defaultValue: 0,
-        max: Number.POSITIVE_INFINITY,
-        min: 0,
-      },
-      {
-        name: 'end',
-        defaultValue: 0,
-        max: Number.POSITIVE_INFINITY,
-        min: 0,
-      },
-    ];
+    this.port.onmessage = (event) => this.dough.init(event.data, sampleRate);
   }
 
   process(inputs, outputs, params) {
     if (this.disconnected) {
       return false;
     }
-    if (currentTime <= params.begin[0]) {
+    if (this.dough._begin === undefined) {
       return true;
     }
-    if (currentTime >= params.end[0]) {
-      return false;
+    if (currentTime <= this.dough._begin) {
+      return true;
     }
-    if (this.t == null) {
-      this.t = params.begin[0] * sampleRate;
+    if (currentTime >= this.dough._end + 1) {
+      return false; // this causes cracks for some reason (seems to kick in too early for some reason)
+      // it works with + 1 but not sure why this is needed
+    }
+    if (this.t === undefined) {
+      this.t = Math.floor(this.dough._begin * sampleRate);
     }
     const output = outputs[0];
     for (let i = 0; i < output[0].length; i++) {
-      const out = this.dough.update(currentTime);
-
+      // const out = this.dough.update(currentTime);
+      const out = this.dough.update(this.t / sampleRate);
       for (let c = 0; c < output.length; c++) {
         //prevent speaker blowout via clipping if threshold exceeds
         output[c][i] = clamp(out, -1, 1);
diff --git a/packages/webaudio/supradough.mjs b/packages/webaudio/supradough.mjs
index 514d5e606..8887a4132 100644
--- a/packages/webaudio/supradough.mjs
+++ b/packages/webaudio/supradough.mjs
@@ -22,10 +22,7 @@ Pattern.prototype.supradough = function () {
     let o = getWorklet(
       ac,
       'dough-processor',
-      {
-        begin, // we might not need these, as we could send them via postMessage below
-        end,
-      },
+      {},
       {
         outputChannelCount: [2],
       },
diff --git a/packages/webaudio/webaudio.mjs b/packages/webaudio/webaudio.mjs
index 44a683480..8f7d041a9 100644
--- a/packages/webaudio/webaudio.mjs
+++ b/packages/webaudio/webaudio.mjs
@@ -6,6 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import * as strudel from '@strudel/core';
 import { superdough, getAudioContext, setLogger, doughTrigger } from 'superdough';
+import './supradough.mjs';
 const { Pattern, logger, repl } = strudel;
 
 setLogger(logger);

From 5129fa667791abb0498f189a0ea3c7c506eac61c Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Wed, 4 Jun 2025 00:48:32 +0100
Subject: [PATCH 03/52] fix click

---
 packages/superdough/dough.mjs    |  7 +++++--
 packages/webaudio/supradough.mjs | 11 +++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index 876cfdf11..bff024150 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -146,6 +146,7 @@ export class ADSR {
   startVal = 0;
 
   update(curTime, gate, attack, decay, susVal, release) {
+    console.info('here')
     switch (this.state) {
       case 'off': {
         if (gate > 0) {
@@ -352,6 +353,7 @@ let getDefaultValue = (key) => defaultDefaultValues[key];
 
 export class Dough {
   init(value, sampleRate) {
+  
     // params without defaults:
     /*
     bank,
@@ -447,12 +449,13 @@ export class Dough {
     // not sure if gain is applied here
     s = s * this.gain;
     // envelope
-    let gate = Number(t >= this._begin && t <= this._end);
+    let gate = Number(t >= this._begin && t <= this._holdEnd);
+
     /* Math.random() > 0.99 && console.log('gate', gate); */
     const env = this._adsr.update(t, gate, this.attack, this.decay, this.sustain, this.release);
     s = s * env;
 
-    s = s * this.postgain * 0.3;
+    s = s * this.postgain * .3
     return s;
   }
 }
diff --git a/packages/webaudio/supradough.mjs b/packages/webaudio/supradough.mjs
index 8887a4132..dcf2cf4c0 100644
--- a/packages/webaudio/supradough.mjs
+++ b/packages/webaudio/supradough.mjs
@@ -1,6 +1,5 @@
 import { Pattern } from '@strudel/core';
-import { connectToDestination, destroyAudioWorkletNode, getAudioContext } from 'superdough';
-
+import { connectToDestination, destroyAudioWorkletNode, getAudioContext, webAudioTimeout } from 'superdough';
 Pattern.prototype.supradough = function () {
   return this.onTrigger((_, hap, __, cps, begin) => {
     const { value } = hap;
@@ -14,10 +13,11 @@ Pattern.prototype.supradough = function () {
     )[3];
 
     const duration = hap.duration / cps;
-    const holdend = begin + duration;
-    const end = holdend + release + 0.01;
+    const holdEnd = begin + duration;
+    const end = holdEnd + release + 0.01;
     value._begin = begin; // these are needed for the gate signal
     value._end = end;
+    value._holdEnd = holdEnd
 
     let o = getWorklet(
       ac,
@@ -29,8 +29,7 @@ Pattern.prototype.supradough = function () {
     );
 
     o.port.postMessage(value); // send value to worklet
-    let timeoutNode = webAudioTimeout(ac, () => destroyAudioWorkletNode(o), begin, end);
-    timeoutNode.stop(end + 0.125);
+    webAudioTimeout(ac, () => destroyAudioWorkletNode(o), begin, end);
     connectToDestination(o); // channels?
   }, 1);
 };

From ff4b7ca1718fc7ffd409f6bd62b3e1234d7acd38 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Wed, 4 Jun 2025 01:08:36 +0100
Subject: [PATCH 04/52] fix volume

---
 packages/superdough/dough.mjs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index bff024150..32ca86ef7 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -146,7 +146,6 @@ export class ADSR {
   startVal = 0;
 
   update(curTime, gate, attack, decay, susVal, release) {
-    console.info('here')
     switch (this.state) {
       case 'off': {
         if (gate > 0) {
@@ -191,6 +190,7 @@ export class ADSR {
       }
       case 'release': {
         let time = curTime - this.startTime;
+
         if (time > release) {
           this.state = 'off';
           return 0;
@@ -353,7 +353,7 @@ let getDefaultValue = (key) => defaultDefaultValues[key];
 
 export class Dough {
   init(value, sampleRate) {
-  
+
     // params without defaults:
     /*
     bank,
@@ -455,7 +455,7 @@ export class Dough {
     const env = this._adsr.update(t, gate, this.attack, this.decay, this.sustain, this.release);
     s = s * env;
 
-    s = s * this.postgain * .3
+    s = s * this.postgain * .2
     return s;
   }
 }

From 930dabe4d6e4952445b952cb88c04a0bef49ee1d Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Thu, 5 Jun 2025 09:54:44 +0200
Subject: [PATCH 05/52] dough as a singleton worklet with voice allocation

---
 packages/superdough/dough.mjs    | 78 ++++++++++++++++++++++++++++++--
 packages/superdough/worklets.mjs | 25 +++-------
 packages/webaudio/supradough.mjs | 40 ++++++++++------
 3 files changed, 104 insertions(+), 39 deletions(-)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index 32ca86ef7..65cc3793f 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -351,9 +351,8 @@ const defaultDefaultValues = {
 
 let getDefaultValue = (key) => defaultDefaultValues[key];
 
-export class Dough {
-  init(value, sampleRate) {
-
+export class DoughVoice {
+  constructor(value) {
     // params without defaults:
     /*
     bank,
@@ -427,7 +426,7 @@ export class Dough {
     this._lpf = this.cutoff ? new Lpf() : null;
     this._adsr = new ADSR();
 
-    this.piOverSr = Math.PI / sampleRate;
+    this.piOverSr = Math.PI / value.sampleRate;
     this.eighthOverLogHalf = 0.125 / Math.log(0.5);
   }
   // credits to pulu: https://github.com/felixroos/kabelsalat/issues/35
@@ -455,7 +454,76 @@ export class Dough {
     const env = this._adsr.update(t, gate, this.attack, this.decay, this.sustain, this.release);
     s = s * env;
 
-    s = s * this.postgain * .2
+    s = s * this.postgain * 0.2;
     return s;
   }
 }
+
+// this class is the interface to the "outer world"
+// it handles spawning and despawning of DoughVoice's
+export class Dough {
+  voices = []; // DoughVoice[]
+  vid = 0;
+  q = [];
+  l = 0; // tbd
+  r = 0; // tbd
+  t = 0;
+  // sampleRate: number, currentTime: number (seconds)
+  constructor(sampleRate, currentTime) {
+    this.sampleRate = sampleRate;
+    this.t = Math.floor(currentTime * sampleRate); // samples
+    // console.log('init dough', this.sampleRate, this.t);
+  }
+  scheduleSpawn(value) {
+    const time = value._begin; // set from supradough.mjs
+    this.schedule({ time, type: 'spawn', arg: value });
+  }
+  spawn(value) {
+    value.id = this.vid++;
+    const voice = new DoughVoice(value);
+    this.voices.push(voice);
+    console.log('spawn', voice.id, value._holdDuration, 'voices:', this.voices.length);
+    // schedule removal
+    const endTime = Math.ceil(value._end * this.sampleRate);
+    this.schedule({ time: endTime /* + 48000 */, type: 'despawn', arg: voice.id });
+  }
+  despawn(vid) {
+    this.voices = this.voices.filter((v) => v.id !== vid);
+    console.log('despawn', vid, 'voices:', this.voices.length);
+  }
+  // schedules a function call with a single argument
+  // msg = {time:number,type:string, arg: any}
+  // the Dough method "type" will be called with "arg" at "time"
+  schedule(msg) {
+    if (!this.q.length) {
+      // if empty, just push
+      this.q.push(msg);
+      return;
+    }
+    // not empty
+    // find index where msg.time fits in
+    let i = 0;
+    while (i < this.q.length && this.q[i].time < msg.time) {
+      i++;
+    }
+    // this ensures q stays sorted by time, so we only need to check q[0]
+    this.q.splice(i, 0, msg);
+  }
+  // maybe update should be called once per block instead for perf reasons?
+  update() {
+    // go over q
+    while (this.q.length > 0 && this.q[0].time <= this.t) {
+      // console.log('schedule', this.q[0]);
+      // trigger due messages. q is sorted, so we only need to check q[0]
+      this[this.q[0].type](this.q[0].arg); // type is expected to be a Dough method
+      this.q.shift();
+    }
+    // add active voices
+    let sum = 0;
+    for (let v = 0; v < this.voices.length; v++) {
+      sum += this.voices[v].update(this.t / this.sampleRate);
+    }
+    this.t++;
+    return sum;
+  }
+}
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 7633c6441..5e5494255 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -900,36 +900,23 @@ registerProcessor('byte-beat-processor', ByteBeatProcessor);
 class DoughProcessor extends AudioWorkletProcessor {
   constructor() {
     super();
-    this.dough = new Dough();
-    this.port.onmessage = (event) => this.dough.init(event.data, sampleRate);
+    this.dough = new Dough(sampleRate, currentTime);
+    this.port.onmessage = (event) => {
+      event.data.sampleRate = sampleRate;
+      this.dough.scheduleSpawn(event.data);
+    };
   }
-
   process(inputs, outputs, params) {
     if (this.disconnected) {
       return false;
     }
-    if (this.dough._begin === undefined) {
-      return true;
-    }
-    if (currentTime <= this.dough._begin) {
-      return true;
-    }
-    if (currentTime >= this.dough._end + 1) {
-      return false; // this causes cracks for some reason (seems to kick in too early for some reason)
-      // it works with + 1 but not sure why this is needed
-    }
-    if (this.t === undefined) {
-      this.t = Math.floor(this.dough._begin * sampleRate);
-    }
     const output = outputs[0];
     for (let i = 0; i < output[0].length; i++) {
-      // const out = this.dough.update(currentTime);
-      const out = this.dough.update(this.t / sampleRate);
+      const out = this.dough.update();
       for (let c = 0; c < output.length; c++) {
         //prevent speaker blowout via clipping if threshold exceeds
         output[c][i] = clamp(out, -1, 1);
       }
-      this.t = this.t + 1;
     }
     return true; // keep the audio processing going
   }
diff --git a/packages/webaudio/supradough.mjs b/packages/webaudio/supradough.mjs
index dcf2cf4c0..f774b7180 100644
--- a/packages/webaudio/supradough.mjs
+++ b/packages/webaudio/supradough.mjs
@@ -1,10 +1,27 @@
 import { Pattern } from '@strudel/core';
-import { connectToDestination, destroyAudioWorkletNode, getAudioContext, webAudioTimeout } from 'superdough';
+import { connectToDestination, getAudioContext, getWorklet } from 'superdough';
+
+let doughWorklet;
+
+function initDoughWorklet() {
+  const ac = getAudioContext();
+  doughWorklet = getWorklet(
+    ac,
+    'dough-processor',
+    {},
+    {
+      outputChannelCount: [2],
+    },
+  );
+  /* webAudioTimeout(ac, () => destroyAudioWorkletNode(doughWorklet), begin, end); */
+  connectToDestination(doughWorklet); // channels?
+}
+
 Pattern.prototype.supradough = function () {
   return this.onTrigger((_, hap, __, cps, begin) => {
     const { value } = hap;
+    // todo: could these calculations be made inside dough as well?
     value.freq = getFrequencyFromValue(hap.value);
-    const ac = getAudioContext();
 
     const release = getADSRValues(
       [value.attack, value.decay, value.sustain, value.release],
@@ -17,19 +34,12 @@ Pattern.prototype.supradough = function () {
     const end = holdEnd + release + 0.01;
     value._begin = begin; // these are needed for the gate signal
     value._end = end;
-    value._holdEnd = holdEnd
+    value._holdEnd = holdEnd;
+    value._holdDuration = duration + release;
 
-    let o = getWorklet(
-      ac,
-      'dough-processor',
-      {},
-      {
-        outputChannelCount: [2],
-      },
-    );
-
-    o.port.postMessage(value); // send value to worklet
-    webAudioTimeout(ac, () => destroyAudioWorkletNode(o), begin, end);
-    connectToDestination(o); // channels?
+    if (!doughWorklet) {
+      initDoughWorklet();
+    }
+    doughWorklet.port.postMessage(value);
   }, 1);
 };

From 2cbd35f6d2a964331b199530ea2be80c1b6e5491 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Thu, 5 Jun 2025 10:26:14 +0200
Subject: [PATCH 06/52] refactor: make webaudio glue as minimal as possible

---
 packages/superdough/dough.mjs    | 36 ++++++++++++++++++++++++++++++--
 packages/webaudio/supradough.mjs | 22 +++----------------
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index 65cc3793f..032bb5a69 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -311,6 +311,7 @@ export const getADSRValues = (params, curve = 'linear', defaultValues) => {
   const sustain = s != null ? s : (a != null && d == null) || (a == null && d == null) ? envmax : envmin;
   return [Math.max(a ?? 0, envmin), Math.max(d ?? 0, envmin), Math.min(sustain, envmax), Math.max(r ?? 0, releaseMin)];
 };
+
 let oscillators = {
   sine: SineOsc,
   saw: SawOsc,
@@ -351,6 +352,33 @@ const defaultDefaultValues = {
 
 let getDefaultValue = (key) => defaultDefaultValues[key];
 
+const chromas = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 };
+const accs = { '#': 1, b: -1, s: 1, f: -1 };
+const note2midi = (note, defaultOctave = 3) => {
+  const [pc, acc = '', oct = defaultOctave] =
+    String(note)
+      .match(/^([a-gA-G])([#bsf]*)([0-9]*)$/)
+      ?.slice(1) || [];
+  if (!pc) {
+    throw new Error('not a note: "' + note + '"');
+  }
+  const chroma = chromas[pc.toLowerCase()];
+  const offset = acc?.split('').reduce((o, char) => o + accs[char], 0) || 0;
+  return (Number(oct) + 1) * 12 + chroma + offset;
+};
+const getFrequency = (value) => {
+  let { note, freq } = value;
+  note = note || 36;
+  if (typeof note === 'string') {
+    note = note2midi(note); // e.g. c3 => 48
+  }
+  if (!freq && typeof note === 'number') {
+    freq = Math.pow(2, (note - 69) / 12) * 440;
+  }
+
+  return Number(freq);
+};
+
 export class DoughVoice {
   constructor(value) {
     // params without defaults:
@@ -392,6 +420,7 @@ export class DoughVoice {
     ir,
     analyze,
     */
+    value.freq = getFrequency(value);
     Object.assign(this, value);
     // params with defaults:
     this.s = this.s ?? getDefaultValue('s');
@@ -421,6 +450,9 @@ export class DoughVoice {
       this.release,
     ]);
 
+    this._holdEnd = this._begin + this._duration; // needed for gate
+    this._end = this._holdEnd + this.release + 0.01; // needed for despawn
+
     const SourceClass = oscillators[this.s] ?? TriOsc;
     this._sound = new SourceClass();
     this._lpf = this.cutoff ? new Lpf() : null;
@@ -482,9 +514,9 @@ export class Dough {
     value.id = this.vid++;
     const voice = new DoughVoice(value);
     this.voices.push(voice);
-    console.log('spawn', voice.id, value._holdDuration, 'voices:', this.voices.length);
+    console.log('spawn', voice.id, 'voices:', this.voices.length);
     // schedule removal
-    const endTime = Math.ceil(value._end * this.sampleRate);
+    const endTime = Math.ceil(voice._end * this.sampleRate);
     this.schedule({ time: endTime /* + 48000 */, type: 'despawn', arg: voice.id });
   }
   despawn(vid) {
diff --git a/packages/webaudio/supradough.mjs b/packages/webaudio/supradough.mjs
index f774b7180..8df18bed6 100644
--- a/packages/webaudio/supradough.mjs
+++ b/packages/webaudio/supradough.mjs
@@ -13,33 +13,17 @@ function initDoughWorklet() {
       outputChannelCount: [2],
     },
   );
-  /* webAudioTimeout(ac, () => destroyAudioWorkletNode(doughWorklet), begin, end); */
   connectToDestination(doughWorklet); // channels?
 }
 
 Pattern.prototype.supradough = function () {
   return this.onTrigger((_, hap, __, cps, begin) => {
-    const { value } = hap;
-    // todo: could these calculations be made inside dough as well?
-    value.freq = getFrequencyFromValue(hap.value);
-
-    const release = getADSRValues(
-      [value.attack, value.decay, value.sustain, value.release],
-      'linear',
-      [0.001, 0.05, 0.6, 0.01],
-    )[3];
-
-    const duration = hap.duration / cps;
-    const holdEnd = begin + duration;
-    const end = holdEnd + release + 0.01;
-    value._begin = begin; // these are needed for the gate signal
-    value._end = end;
-    value._holdEnd = holdEnd;
-    value._holdDuration = duration + release;
+    hap.value._begin = begin;
+    hap.value._duration = hap.duration / cps;
 
     if (!doughWorklet) {
       initDoughWorklet();
     }
-    doughWorklet.port.postMessage(value);
+    doughWorklet.port.postMessage(hap.value);
   }, 1);
 };

From f0e6c5483c012de6d4c5de79fa2ac301a0c9ae94 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Thu, 5 Jun 2025 10:30:53 +0200
Subject: [PATCH 07/52] handle invalid spawns + remove logs

---
 packages/superdough/dough.mjs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index 032bb5a69..7261c4a5a 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -507,6 +507,12 @@ export class Dough {
     // console.log('init dough', this.sampleRate, this.t);
   }
   scheduleSpawn(value) {
+    if (value._begin === undefined) {
+      throw new Error('[dough]: scheduleSpawn expected _begin to be set');
+    }
+    if (value._duration === undefined) {
+      throw new Error('[dough]: scheduleSpawn expected _duration to be set');
+    }
     const time = value._begin; // set from supradough.mjs
     this.schedule({ time, type: 'spawn', arg: value });
   }
@@ -514,14 +520,14 @@ export class Dough {
     value.id = this.vid++;
     const voice = new DoughVoice(value);
     this.voices.push(voice);
-    console.log('spawn', voice.id, 'voices:', this.voices.length);
+    // console.log('spawn', voice.id, 'voices:', this.voices.length);
     // schedule removal
     const endTime = Math.ceil(voice._end * this.sampleRate);
     this.schedule({ time: endTime /* + 48000 */, type: 'despawn', arg: voice.id });
   }
   despawn(vid) {
     this.voices = this.voices.filter((v) => v.id !== vid);
-    console.log('despawn', vid, 'voices:', this.voices.length);
+    // console.log('despawn', vid, 'voices:', this.voices.length);
   }
   // schedules a function call with a single argument
   // msg = {time:number,type:string, arg: any}

From ccec7e725ab6344d8a4e58828f6b1cba1c85f776 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Thu, 5 Jun 2025 11:04:55 +0200
Subject: [PATCH 08/52] poc: render pattern audio with node script

---
 packages/superdough/.gitignore       |  1 +
 packages/superdough/dough-export.mjs | 61 ++++++++++++++++++++++++++++
 packages/superdough/dough.mjs        | 15 +++----
 packages/superdough/package.json     |  3 +-
 packages/superdough/worklets.mjs     |  5 +--
 pnpm-lock.yaml                       |  8 ++++
 6 files changed, 81 insertions(+), 12 deletions(-)
 create mode 100644 packages/superdough/.gitignore
 create mode 100644 packages/superdough/dough-export.mjs

diff --git a/packages/superdough/.gitignore b/packages/superdough/.gitignore
new file mode 100644
index 000000000..d21cbdf3e
--- /dev/null
+++ b/packages/superdough/.gitignore
@@ -0,0 +1 @@
+pattern.wav
diff --git a/packages/superdough/dough-export.mjs b/packages/superdough/dough-export.mjs
new file mode 100644
index 000000000..5f8b9a8ee
--- /dev/null
+++ b/packages/superdough/dough-export.mjs
@@ -0,0 +1,61 @@
+// this is a poc of how a pattern can be rendered as a wav file using node
+// run via: node dough-export.mjs
+import fs from 'node:fs';
+import WavEncoder from 'wav-encoder';
+import { evalScope } from '@strudel/core';
+import { miniAllStrings } from '@strudel/mini';
+import { Dough } from './dough.mjs';
+
+await evalScope(
+  import('@strudel/core'),
+  import('@strudel/mini'),
+  import('@strudel/tonal'),
+  // import('@strudel/tonal'),
+);
+
+miniAllStrings(); // allows using single quotes for mini notation / skip transpilation
+
+let sampleRate = 48000,
+  cps = 0.5;
+
+let pat = note('[c e g b]*3')
+  .add(note(7))
+  .lpf(sine.rangex(200, 4000).slow(2))
+  .lpq(0.3)
+  .s('<pulse saw tri>*2')
+  .att(0.01)
+  .rel(0.2)
+  .clip(2)
+  .delay(0.5)
+  .jux(rev)
+  .sometimes(add(note(12)))
+  .gain(0.25)
+  .slow(1 / cps);
+
+let cycles = 4;
+let seconds = cycles + 1; // 1s release tail
+const haps = pat.queryArc(0, cycles);
+
+const dough = new Dough(sampleRate);
+
+console.log('spawn voices...');
+haps.forEach((hap) => {
+  hap.value._begin = Number(hap.whole.begin);
+  hap.value._duration = hap.duration / cps;
+  dough.scheduleSpawn(hap.value);
+});
+console.log(`render ${seconds}s long buffer...`);
+const buffer = new Float32Array(seconds * sampleRate);
+while (dough.t <= buffer.length) {
+  buffer[dough.t] = dough.update();
+}
+console.log('done!');
+
+const patternAudio = {
+  sampleRate,
+  channelData: [buffer],
+};
+
+WavEncoder.encode(patternAudio).then((buffer) => {
+  fs.writeFileSync('pattern.wav', new Float32Array(buffer));
+});
diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index 7261c4a5a..21918f95b 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -1,12 +1,12 @@
 // this is dough, the superdough without dependencies
-
-const ISR = 1 / sampleRate;
+const SAMPLE_RATE = typeof sampleRate !== 'undefined' ? sampleRate : 48000;
+const ISR = 1 / SAMPLE_RATE;
 // https://garten.salat.dev/audio-DSP/oscillators.html
 export class SineOsc {
   phase = 0;
   update(freq) {
     const value = Math.sin(this.phase * 2 * Math.PI);
-    this.phase = (this.phase + freq / sampleRate) % 1;
+    this.phase = (this.phase + freq / SAMPLE_RATE) % 1;
     return value;
   }
 }
@@ -39,7 +39,7 @@ export class SawOsc {
   //phase = Math.random();
   phase = 0;
   update(freq) {
-    const dt = freq / sampleRate;
+    const dt = freq / SAMPLE_RATE;
     let p = polyBlep(this.phase, dt);
     let s = 2 * this.phase - 1 - p;
     this.phase += dt;
@@ -216,12 +216,12 @@ const MAX_DELAY_TIME = 10;
 export class Delay {
   writeIdx = 0;
   readIdx = 0;
-  buffer = new Float32Array(MAX_DELAY_TIME * sampleRate); // .fill(0)
+  buffer = new Float32Array(MAX_DELAY_TIME * SAMPLE_RATE); // .fill(0)
   write(s, delayTime) {
     this.writeIdx = (this.writeIdx + 1) % this.buffer.length;
     this.buffer[this.writeIdx] = s;
     // Calculate how far in the past to read
-    let numSamples = Math.min(Math.floor(sampleRate * delayTime), this.buffer.length - 1);
+    let numSamples = Math.min(Math.floor(SAMPLE_RATE * delayTime), this.buffer.length - 1);
     this.readIdx = this.writeIdx - numSamples;
     // If past the start of the buffer, wrap around
     if (this.readIdx < 0) this.readIdx += this.buffer.length;
@@ -501,7 +501,7 @@ export class Dough {
   r = 0; // tbd
   t = 0;
   // sampleRate: number, currentTime: number (seconds)
-  constructor(sampleRate, currentTime) {
+  constructor(sampleRate = 48000, currentTime = 0) {
     this.sampleRate = sampleRate;
     this.t = Math.floor(currentTime * sampleRate); // samples
     // console.log('init dough', this.sampleRate, this.t);
@@ -513,6 +513,7 @@ export class Dough {
     if (value._duration === undefined) {
       throw new Error('[dough]: scheduleSpawn expected _duration to be set');
     }
+    value.sampleRate = this.sampleRate;
     const time = value._begin; // set from supradough.mjs
     this.schedule({ time, type: 'spawn', arg: value });
   }
diff --git a/packages/superdough/package.json b/packages/superdough/package.json
index a835f252d..6b45144e4 100644
--- a/packages/superdough/package.json
+++ b/packages/superdough/package.json
@@ -33,7 +33,8 @@
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "devDependencies": {
     "vite": "^6.0.11",
-    "vite-plugin-bundle-audioworklet": "workspace:*"
+    "vite-plugin-bundle-audioworklet": "workspace:*",
+    "wav-encoder": "^1.3.0"
   },
   "dependencies": {
     "nanostores": "^0.11.3"
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 5e5494255..2edcc6f53 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -901,10 +901,7 @@ class DoughProcessor extends AudioWorkletProcessor {
   constructor() {
     super();
     this.dough = new Dough(sampleRate, currentTime);
-    this.port.onmessage = (event) => {
-      event.data.sampleRate = sampleRate;
-      this.dough.scheduleSpawn(event.data);
-    };
+    this.port.onmessage = (event) => this.dough.scheduleSpawn(event.data);
   }
   process(inputs, outputs, params) {
     if (this.disconnected) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a23c80924..ed8a7c014 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -485,6 +485,9 @@ importers:
       vite-plugin-bundle-audioworklet:
         specifier: workspace:*
         version: link:../vite-plugin-bundle-audioworklet
+      wav-encoder:
+        specifier: ^1.3.0
+        version: 1.3.0
 
   packages/tidal:
     dependencies:
@@ -7464,6 +7467,9 @@ packages:
   walk-up-path@3.0.1:
     resolution: {integrity: sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==}
 
+  wav-encoder@1.3.0:
+    resolution: {integrity: sha512-FXJdEu2qDOI+wbVYZpu21CS1vPEg5NaxNskBr4SaULpOJMrLE6xkH8dECa7PiS+ZoeyvP7GllWUAxPN3AvFSEw==}
+
   wav@1.0.2:
     resolution: {integrity: sha512-viHtz3cDd/Tcr/HbNqzQCofKdF6kWUymH9LGDdskfWFoIy/HJ+RTihgjEcHfnsy1PO4e9B+y4HwgTwMrByquhg==}
 
@@ -15839,6 +15845,8 @@ snapshots:
 
   walk-up-path@3.0.1: {}
 
+  wav-encoder@1.3.0: {}
+
   wav@1.0.2:
     dependencies:
       buffer-alloc: 1.2.0

From 87598e10d1c1af739cfc26f9efebe6e0039f6be1 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Fri, 6 Jun 2025 08:17:20 +0200
Subject: [PATCH 09/52] coarse

---
 packages/superdough/dough.mjs | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index 21918f95b..b6ded0d15 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -292,6 +292,19 @@ export class Sequence {
   }
 }
 
+// sample rate bit crusher
+export class Coarse {
+  hold = 0;
+  t = 0;
+  update(input, coarse) {
+    if (this.t++ % coarse === 0) {
+      this.t = 0;
+      this.hold = input;
+    }
+    return this.hold;
+  }
+}
+
 export function _rangex(sig, min, max) {
   let logmin = Math.log(min);
   let range = Math.log(max) - logmin;
@@ -457,6 +470,7 @@ export class DoughVoice {
     this._sound = new SourceClass();
     this._lpf = this.cutoff ? new Lpf() : null;
     this._adsr = new ADSR();
+    this._coarse = this.coarse ? new Coarse() : null;
 
     this.piOverSr = Math.PI / value.sampleRate;
     this.eighthOverLogHalf = 0.125 / Math.log(0.5);
@@ -475,7 +489,10 @@ export class DoughVoice {
     // lpf
     if (this._lpf) {
       const cutoff = this.freq2cutoff(this.cutoff);
-      s = this._lpf ? this._lpf.update(s, cutoff, this.resonance) : s;
+      s = this._lpf.update(s, cutoff, this.resonance);
+    }
+    if (this._coarse) {
+      s = this._coarse.update(s, this.coarse);
     }
     // not sure if gain is applied here
     s = s * this.gain;

From 0cc18a64682c7f984f549e0e0240694e0721811e Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Fri, 6 Jun 2025 08:27:47 +0200
Subject: [PATCH 10/52] crush (might be wrong)

---
 packages/superdough/dough.mjs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index b6ded0d15..bd226cc72 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -305,6 +305,15 @@ export class Coarse {
   }
 }
 
+// amplitude bit crusher
+export class Crush {
+  update(input, crush) {
+    crush = Math.max(1, crush);
+    const x = Math.pow(2, crush - 1);
+    return Math.round(input * x) / x;
+  }
+}
+
 export function _rangex(sig, min, max) {
   let logmin = Math.log(min);
   let range = Math.log(max) - logmin;
@@ -471,6 +480,7 @@ export class DoughVoice {
     this._lpf = this.cutoff ? new Lpf() : null;
     this._adsr = new ADSR();
     this._coarse = this.coarse ? new Coarse() : null;
+    this._crush = this.crush ? new Crush() : null;
 
     this.piOverSr = Math.PI / value.sampleRate;
     this.eighthOverLogHalf = 0.125 / Math.log(0.5);
@@ -494,6 +504,9 @@ export class DoughVoice {
     if (this._coarse) {
       s = this._coarse.update(s, this.coarse);
     }
+    if (this._crush) {
+      s = this._crush.update(s, this.crush);
+    }
     // not sure if gain is applied here
     s = s * this.gain;
     // envelope

From 623bf9336865de8ff68bc8d2387a67e2ee412e6e Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Fri, 6 Jun 2025 08:50:02 +0200
Subject: [PATCH 11/52] panning

---
 packages/superdough/dough.mjs    | 25 +++++++++++++++++++------
 packages/superdough/worklets.mjs |  4 ++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index bd226cc72..e6190f140 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -370,6 +370,7 @@ const defaultDefaultValues = {
   velocity: 1,
   fft: 8,
   z: 'triangle',
+  pan: 0.5,
 };
 
 let getDefaultValue = (key) => defaultDefaultValues[key];
@@ -402,6 +403,8 @@ const getFrequency = (value) => {
 };
 
 export class DoughVoice {
+  l = 0;
+  r = 0;
   constructor(value) {
     // params without defaults:
     /*
@@ -464,6 +467,7 @@ export class DoughVoice {
     this.i = this.i ?? getDefaultValue('i');
     this.velocity = this.velocity ?? getDefaultValue('velocity');
     this.fft = this.fft ?? getDefaultValue('fft');
+    this.pan = this.pan ?? getDefaultValue('pan');
 
     [this.attack, this.decay, this.sustain, this.release] = getADSRValues([
       this.attack,
@@ -517,7 +521,15 @@ export class DoughVoice {
     s = s * env;
 
     s = s * this.postgain * 0.2;
-    return s;
+
+    if (this.pan === 0.5) {
+      this.l = this.r = s; // mono
+    } else {
+      // stereo
+      const pos = (this.pan * Math.PI) / 2;
+      this.l = s * Math.cos(pos);
+      this.r = s * Math.sin(pos);
+    }
   }
 }
 
@@ -527,8 +539,7 @@ export class Dough {
   voices = []; // DoughVoice[]
   vid = 0;
   q = [];
-  l = 0; // tbd
-  r = 0; // tbd
+  channels = [0, 0];
   t = 0;
   // sampleRate: number, currentTime: number (seconds)
   constructor(sampleRate = 48000, currentTime = 0) {
@@ -588,11 +599,13 @@ export class Dough {
       this.q.shift();
     }
     // add active voices
-    let sum = 0;
+    this.channels[0] = 0;
+    this.channels[1] = 0;
     for (let v = 0; v < this.voices.length; v++) {
-      sum += this.voices[v].update(this.t / this.sampleRate);
+      this.voices[v].update(this.t / this.sampleRate);
+      this.channels[0] += this.voices[v].l;
+      this.channels[1] += this.voices[v].r;
     }
     this.t++;
-    return sum;
   }
 }
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 2edcc6f53..d8f189779 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -909,10 +909,10 @@ class DoughProcessor extends AudioWorkletProcessor {
     }
     const output = outputs[0];
     for (let i = 0; i < output[0].length; i++) {
-      const out = this.dough.update();
+      this.dough.update();
       for (let c = 0; c < output.length; c++) {
         //prevent speaker blowout via clipping if threshold exceeds
-        output[c][i] = clamp(out, -1, 1);
+        output[c][i] = clamp(this.dough.channels[c], -1, 1);
       }
     }
     return true; // keep the audio processing going

From 9ed690ce4551a471beb7784208f2fc275f7a808e Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Fri, 6 Jun 2025 09:37:40 +0200
Subject: [PATCH 12/52] pulse osc + velocity

---
 packages/superdough/dough.mjs | 38 ++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index e6190f140..323e78d5c 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -82,7 +82,25 @@ export class Lpf {
   }
 }
 
-export class PulseOsc {
+class PulseOsc {
+  constructor(phase = 0) {
+    this.phase = phase;
+  }
+  saw(offset, dt) {
+    let phase = (this.phase + offset) % 1;
+    let p = polyBlep(phase, dt);
+    return 2 * phase - 1 - p;
+  }
+  update(freq, pw = 0.5) {
+    const dt = freq / sampleRate;
+    let pulse = this.saw(0, dt) - this.saw(pw, dt);
+    this.phase = (this.phase + dt) % 1;
+    return pulse + pw * 2 - 1;
+  }
+}
+
+// non bandlimited (has aliasing)
+export class PulzeOsc {
   phase = 0;
   update(freq, duty = 0.5) {
     this.phase += ISR * freq;
@@ -343,14 +361,16 @@ let oscillators = {
   tri: TriOsc,
   triangle: TriOsc,
   pulse: PulseOsc,
+  pulze: PulzeOsc,
   dust: Dust,
   impulse: Impulse,
 };
 
 const defaultDefaultValues = {
   s: 'triangle',
-  gain: 0.8,
+  gain: 1,
   postgain: 1,
+  velocity: 1,
   density: '.03',
   ftype: '12db',
   fanchor: 0,
@@ -367,7 +387,6 @@ const defaultDefaultValues = {
   delaytime: 0.25,
   orbit: 1,
   i: 1,
-  velocity: 1,
   fft: 8,
   z: 'triangle',
   pan: 0.5,
@@ -450,6 +469,7 @@ export class DoughVoice {
     // params with defaults:
     this.s = this.s ?? getDefaultValue('s');
     this.gain = this.gain ?? getDefaultValue('gain');
+    this.velocity = this.velocity ?? getDefaultValue('velocity');
     this.postgain = this.postgain ?? getDefaultValue('postgain');
     this.density = this.density ?? getDefaultValue('density');
     this.fanchor = this.fanchor ?? getDefaultValue('fanchor');
@@ -465,7 +485,6 @@ export class DoughVoice {
     this.delaytime = this.delaytime ?? getDefaultValue('delaytime');
     this.orbit = this.orbit ?? getDefaultValue('orbit');
     this.i = this.i ?? getDefaultValue('i');
-    this.velocity = this.velocity ?? getDefaultValue('velocity');
     this.fft = this.fft ?? getDefaultValue('fft');
     this.pan = this.pan ?? getDefaultValue('pan');
 
@@ -498,8 +517,13 @@ export class DoughVoice {
     if (!this._sound) {
       return 0;
     }
+    let s = 0;
     // sound source
-    let s = this._sound.update(this.freq);
+    if (this.s === 'pulse') {
+      s = this._sound.update(this.freq, this.pw ?? 0.5);
+    } else {
+      s = this._sound.update(this.freq);
+    }
     // lpf
     if (this._lpf) {
       const cutoff = this.freq2cutoff(this.cutoff);
@@ -511,8 +535,8 @@ export class DoughVoice {
     if (this._crush) {
       s = this._crush.update(s, this.crush);
     }
-    // not sure if gain is applied here
-    s = s * this.gain;
+    // not sure if gain/velocity is applied here
+    s = s * this.gain * this.velocity;
     // envelope
     let gate = Number(t >= this._begin && t <= this._holdEnd);
 

From 794bf86904fe89e9213e75258a06f33a6b7e87f0 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Fri, 6 Jun 2025 09:56:41 +0200
Subject: [PATCH 13/52] distort

---
 packages/superdough/dough.mjs | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index 323e78d5c..d687bb63c 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -332,6 +332,26 @@ export class Crush {
   }
 }
 
+// (unused) overdrive-style distortion (adapted from noisecraft)
+export class Overdrive {
+  update(input, amount = 0, postgain = 1) {
+    amount = Math.min(Math.max(amount, 0), 1);
+    amount -= 0.01;
+    const shape = (2 * amount) / (1 - amount);
+    return (((1 + shape) * input) / (1 + shape * Math.abs(input))) * postgain;
+  }
+}
+
+// this is the distort from superdough
+export class Distort {
+  update(input, distort = 0, postgain = 1) {
+    postgain = Math.max(0.001, Math.min(1, postgain));
+    const shape = Math.expm1(distort);
+    return (((1 + shape) * input) / (1 + shape * Math.abs(input))) * postgain;
+  }
+}
+// distortion could be expressed as a function, because it's stateless
+
 export function _rangex(sig, min, max) {
   let logmin = Math.log(min);
   let range = Math.log(max) - logmin;
@@ -504,6 +524,7 @@ export class DoughVoice {
     this._adsr = new ADSR();
     this._coarse = this.coarse ? new Coarse() : null;
     this._crush = this.crush ? new Crush() : null;
+    this._distort = this.distort ? new Distort() : null;
 
     this.piOverSr = Math.PI / value.sampleRate;
     this.eighthOverLogHalf = 0.125 / Math.log(0.5);
@@ -529,12 +550,11 @@ export class DoughVoice {
       const cutoff = this.freq2cutoff(this.cutoff);
       s = this._lpf.update(s, cutoff, this.resonance);
     }
-    if (this._coarse) {
-      s = this._coarse.update(s, this.coarse);
-    }
-    if (this._crush) {
-      s = this._crush.update(s, this.crush);
-    }
+
+    this._coarse && (s = this._coarse.update(s, this.coarse));
+    this._crush && (s = this._crush.update(s, this.crush));
+    this._distort && (s = this._distort.update(s, this.distort, this.distortvol));
+
     // not sure if gain/velocity is applied here
     s = s * this.gain * this.velocity;
     // envelope

From 6cf0b6f6515910da199a939740296a694100e5bf Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Fri, 6 Jun 2025 10:12:49 +0200
Subject: [PATCH 14/52] hpf + bpf

---
 packages/superdough/dough.mjs | 58 +++++++++++++++++------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index d687bb63c..dce26ab3b 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -60,7 +60,7 @@ export class TriOsc {
   }
 }
 
-export class Lpf {
+export class TwoPoleFilter {
   s0 = 0;
   s1 = 0;
   update(s, cutoff, resonance = 0) {
@@ -70,15 +70,10 @@ export class Lpf {
     var c = Math.pow(0.5, (1 - cutoff) / 0.125);
     var r = Math.pow(0.5, (resonance + 0.125) / 0.125);
     var mrc = 1 - r * c;
-    var v0 = this.s0;
-    var v1 = this.s1;
-    // Apply the filter to the sample
-    v0 = mrc * v0 - c * v1 + c * s;
-    v1 = mrc * v1 + c * v0;
-    s = v1;
-    this.s0 = v0;
-    this.s1 = v1;
-    return s;
+
+    this.s0 = mrc * this.s0 - c * this.s1 + c * s; // bpf
+    this.s1 = mrc * this.s1 + c * this.s0; // lpf
+    return this.s1; // return lpf by default
   }
 }
 
@@ -287,6 +282,7 @@ export class Slew {
   }
 }
 
+// overdrive style distortion (adapted from noisecraft) currently unused
 export function applyDistortion(x, amount) {
   amount = Math.min(Math.max(amount, 0), 1);
   amount -= 0.01;
@@ -332,16 +328,6 @@ export class Crush {
   }
 }
 
-// (unused) overdrive-style distortion (adapted from noisecraft)
-export class Overdrive {
-  update(input, amount = 0, postgain = 1) {
-    amount = Math.min(Math.max(amount, 0), 1);
-    amount -= 0.01;
-    const shape = (2 * amount) / (1 - amount);
-    return (((1 + shape) * input) / (1 + shape * Math.abs(input))) * postgain;
-  }
-}
-
 // this is the distort from superdough
 export class Distort {
   update(input, distort = 0, postgain = 1) {
@@ -394,9 +380,12 @@ const defaultDefaultValues = {
   density: '.03',
   ftype: '12db',
   fanchor: 0,
-  resonance: 1,
-  hresonance: 1,
-  bandq: 1,
+  //resonance: 1, // superdough resonance is scaled differently
+  resonance: 0,
+  //hresonance: 1, // superdough resonance is scaled differently
+  hresonance: 0,
+  // bandq: 1,  // superdough resonance is scaled differently
+  bandq: 0,
   channels: [1, 2],
   phaserdepth: 0.75,
   shapevol: 1,
@@ -470,11 +459,7 @@ export class DoughVoice {
     phaserrate,
     phasersweep,
     phasercenter,
-    coarse,
-    crush,
     shape,
-    distort,
-    pan,
     vowel,
     room,
     roomfade,
@@ -520,7 +505,9 @@ export class DoughVoice {
 
     const SourceClass = oscillators[this.s] ?? TriOsc;
     this._sound = new SourceClass();
-    this._lpf = this.cutoff ? new Lpf() : null;
+    this._lpf = this.cutoff ? new TwoPoleFilter() : null;
+    this._hpf = this.hcutoff ? new TwoPoleFilter() : null;
+    this._bpf = this.bandf ? new TwoPoleFilter() : null;
     this._adsr = new ADSR();
     this._coarse = this.coarse ? new Coarse() : null;
     this._crush = this.crush ? new Crush() : null;
@@ -548,7 +535,20 @@ export class DoughVoice {
     // lpf
     if (this._lpf) {
       const cutoff = this.freq2cutoff(this.cutoff);
-      s = this._lpf.update(s, cutoff, this.resonance);
+      this._lpf.update(s, cutoff, this.resonance);
+      s = this._lpf.s1;
+    }
+    // hpf
+    if (this._hpf) {
+      const cutoff = this.freq2cutoff(this.hcutoff);
+      this._hpf.update(s, cutoff, this.hresonance);
+      s = s - this._hpf.s1;
+    }
+    // bpf
+    if (this._bpf) {
+      const cutoff = this.freq2cutoff(this.bandf);
+      this._bpf.update(s, cutoff, this.bandq);
+      s = this._bpf.s0;
     }
 
     this._coarse && (s = this._coarse.update(s, this.coarse));

From e4cd5dc552bcd3038b25b2914d475626d2277423 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Fri, 6 Jun 2025 10:55:38 +0200
Subject: [PATCH 15/52] rough filter envelope implementation

---
 packages/superdough/dough.mjs | 60 ++++++++++++++++++++++++++++++-----
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index dce26ab3b..09f85e153 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -505,10 +505,44 @@ export class DoughVoice {
 
     const SourceClass = oscillators[this.s] ?? TriOsc;
     this._sound = new SourceClass();
+
+    // filter setup
     this._lpf = this.cutoff ? new TwoPoleFilter() : null;
+    if (this.lpenv) {
+      this._lpenv = new ADSR();
+      [this.lpattack, this.lpdecay, this.lpsustain, this.lprelease] = getADSRValues([
+        this.lpattack,
+        this.lpdecay,
+        this.lpsustain,
+        this.lprelease,
+      ]);
+    }
+
     this._hpf = this.hcutoff ? new TwoPoleFilter() : null;
+    if (this.hpenv) {
+      this._hpenv = new ADSR();
+      [this.hpattack, this.hpdecay, this.hpsustain, this.hprelease] = getADSRValues([
+        this.hpattack,
+        this.hpdecay,
+        this.hpsustain,
+        this.hprelease,
+      ]);
+    }
     this._bpf = this.bandf ? new TwoPoleFilter() : null;
+    if (this.bpenv) {
+      this._bpenv = new ADSR();
+      [this.bpattack, this.bpdecay, this.bpsustain, this.bprelease] = getADSRValues([
+        this.bpattack,
+        this.bpdecay,
+        this.bpsustain,
+        this.bprelease,
+      ]);
+    }
+
+    // gain envelope
     this._adsr = new ADSR();
+
+    // fx setup
     this._coarse = this.coarse ? new Coarse() : null;
     this._crush = this.crush ? new Crush() : null;
     this._distort = this.distort ? new Distort() : null;
@@ -532,21 +566,36 @@ export class DoughVoice {
     } else {
       s = this._sound.update(this.freq);
     }
+    let gate = Number(t >= this._begin && t <= this._holdEnd);
+    s = s * this.gain * this.velocity;
+
     // lpf
     if (this._lpf) {
-      const cutoff = this.freq2cutoff(this.cutoff);
+      let cutoff = this.freq2cutoff(this.cutoff);
+      if (this._lpenv) {
+        const env = this._lpenv.update(t, gate, this.lpattack, this.lpdecay, this.lpsustain, this.lprelease) ** 2;
+        cutoff = cutoff + env * this.lpenv * cutoff; // todo proper scaling
+      }
       this._lpf.update(s, cutoff, this.resonance);
       s = this._lpf.s1;
     }
     // hpf
     if (this._hpf) {
-      const cutoff = this.freq2cutoff(this.hcutoff);
+      let cutoff = this.freq2cutoff(this.hcutoff);
+      if (this._hpenv) {
+        const env = this._hpenv.update(t, gate, this.hpattack, this.hpdecay, this.hpsustain, this.hprelease) ** 2;
+        cutoff = cutoff + env * this.hpenv * cutoff; // todo proper scaling
+      }
       this._hpf.update(s, cutoff, this.hresonance);
       s = s - this._hpf.s1;
     }
     // bpf
     if (this._bpf) {
-      const cutoff = this.freq2cutoff(this.bandf);
+      let cutoff = this.freq2cutoff(this.bandf);
+      if (this._bpenv) {
+        const env = this._bpenv.update(t, gate, this.bpattack, this.bpdecay, this.bpsustain, this.bprelease) ** 2;
+        cutoff = cutoff + env * this.bpenv * cutoff; // todo proper scaling
+      }
       this._bpf.update(s, cutoff, this.bandq);
       s = this._bpf.s0;
     }
@@ -555,11 +604,6 @@ export class DoughVoice {
     this._crush && (s = this._crush.update(s, this.crush));
     this._distort && (s = this._distort.update(s, this.distort, this.distortvol));
 
-    // not sure if gain/velocity is applied here
-    s = s * this.gain * this.velocity;
-    // envelope
-    let gate = Number(t >= this._begin && t <= this._holdEnd);
-
     /* Math.random() > 0.99 && console.log('gate', gate); */
     const env = this._adsr.update(t, gate, this.attack, this.decay, this.sustain, this.release);
     s = s * env;

From 998a0102471f63eec033f3bc52e330e1fcfc7b6e Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Fri, 6 Jun 2025 11:21:01 +0200
Subject: [PATCH 16/52] better filter envelopes

---
 packages/superdough/dough.mjs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/superdough/dough.mjs b/packages/superdough/dough.mjs
index 09f85e153..a292b0c8b 100644
--- a/packages/superdough/dough.mjs
+++ b/packages/superdough/dough.mjs
@@ -571,31 +571,34 @@ export class DoughVoice {
 
     // lpf
     if (this._lpf) {
-      let cutoff = this.freq2cutoff(this.cutoff);
+      let cutoff = this.cutoff;
       if (this._lpenv) {
         const env = this._lpenv.update(t, gate, this.lpattack, this.lpdecay, this.lpsustain, this.lprelease) ** 2;
-        cutoff = cutoff + env * this.lpenv * cutoff; // todo proper scaling
+        cutoff = 2 ** this.lpenv * env * cutoff + cutoff;
       }
+      cutoff = this.freq2cutoff(cutoff);
       this._lpf.update(s, cutoff, this.resonance);
       s = this._lpf.s1;
     }
     // hpf
     if (this._hpf) {
-      let cutoff = this.freq2cutoff(this.hcutoff);
+      let cutoff = this.hcutoff;
       if (this._hpenv) {
         const env = this._hpenv.update(t, gate, this.hpattack, this.hpdecay, this.hpsustain, this.hprelease) ** 2;
-        cutoff = cutoff + env * this.hpenv * cutoff; // todo proper scaling
+        cutoff = 2 ** this.hpenv * env * cutoff + cutoff;
       }
+      cutoff = this.freq2cutoff(cutoff);
       this._hpf.update(s, cutoff, this.hresonance);
       s = s - this._hpf.s1;
     }
     // bpf
     if (this._bpf) {
-      let cutoff = this.freq2cutoff(this.bandf);
+      let cutoff = this.bandf;
       if (this._bpenv) {
         const env = this._bpenv.update(t, gate, this.bpattack, this.bpdecay, this.bpsustain, this.bprelease) ** 2;
-        cutoff = cutoff + env * this.bpenv * cutoff; // todo proper scaling
+        cutoff = 2 ** this.bpenv * env * cutoff + cutoff;
       }
+      cutoff = this.freq2cutoff(cutoff);
       this._bpf.update(s, cutoff, this.bandq);
       s = this._bpf.s0;
     }

From ccc90d547cf85ec06b0433b6c02eb18c52112f1c Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Fri, 6 Jun 2025 15:47:19 +0200
Subject: [PATCH 17/52] ignore dough-export to fix checks

---
 eslint.config.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 19d9bb390..0ba44da07 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -42,6 +42,7 @@ export default [
       '**/hydra.mjs',
       '**/jsdoc-synonyms.js',
       'packages/hs2js/src/hs2js.mjs',
+      'packages/superdough/dough-export.mjs',
       '**/samples',
     ],
   },

From 43c05cb5041e18431dd297be5fb5a9b3044aaf0d Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Fri, 6 Jun 2025 16:17:05 +0200
Subject: [PATCH 18/52] move supradough to separate package

---
 eslint.config.mjs                             |  2 +-
 packages/superdough/package.json              |  3 +-
 packages/superdough/superdough.mjs            |  9 ++++-
 packages/superdough/synth.mjs                 |  4 +-
 packages/superdough/worklets.mjs              | 25 -------------
 .../{superdough => supradough}/.gitignore     |  0
 packages/supradough/README.md                 |  3 ++
 .../dough-export.mjs                          |  0
 packages/supradough/dough-worklet.mjs         | 27 ++++++++++++++
 packages/{superdough => supradough}/dough.mjs |  0
 packages/supradough/index.mjs                 |  4 ++
 packages/supradough/package.json              | 37 +++++++++++++++++++
 packages/webaudio/package.json                |  3 +-
 packages/webaudio/webaudio.mjs                |  6 ++-
 pnpm-lock.yaml                                | 12 ++++++
 15 files changed, 102 insertions(+), 33 deletions(-)
 rename packages/{superdough => supradough}/.gitignore (100%)
 create mode 100644 packages/supradough/README.md
 rename packages/{superdough => supradough}/dough-export.mjs (100%)
 create mode 100644 packages/supradough/dough-worklet.mjs
 rename packages/{superdough => supradough}/dough.mjs (100%)
 create mode 100644 packages/supradough/index.mjs
 create mode 100644 packages/supradough/package.json

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 0ba44da07..f2cf86307 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -42,7 +42,7 @@ export default [
       '**/hydra.mjs',
       '**/jsdoc-synonyms.js',
       'packages/hs2js/src/hs2js.mjs',
-      'packages/superdough/dough-export.mjs',
+      'packages/supradough/dough-export.mjs',
       '**/samples',
     ],
   },
diff --git a/packages/superdough/package.json b/packages/superdough/package.json
index 6b45144e4..a835f252d 100644
--- a/packages/superdough/package.json
+++ b/packages/superdough/package.json
@@ -33,8 +33,7 @@
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "devDependencies": {
     "vite": "^6.0.11",
-    "vite-plugin-bundle-audioworklet": "workspace:*",
-    "wav-encoder": "^1.3.0"
+    "vite-plugin-bundle-audioworklet": "workspace:*"
   },
   "dependencies": {
     "nanostores": "^0.11.3"
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index 1069d4e84..a6e54435c 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -190,11 +190,18 @@ export function getAudioContextCurrentTime() {
   return getAudioContext().currentTime;
 }
 
+let externalWorklets = [];
+export function registerWorklet(url) {
+  externalWorklets.push(url);
+}
+
 let workletsLoading;
 function loadWorklets() {
   if (!workletsLoading) {
     const audioCtx = getAudioContext();
-    workletsLoading = audioCtx.audioWorklet.addModule(workletsUrl);
+    const allWorkletURLs = externalWorklets.concat([workletsUrl]);
+    console.log('allWorkletURLs', allWorkletURLs);
+    workletsLoading = Promise.all(allWorkletURLs.map((workletURL) => audioCtx.audioWorklet.addModule(workletURL)));
   }
 
   return workletsLoading;
diff --git a/packages/superdough/synth.mjs b/packages/superdough/synth.mjs
index 7d175d6c4..834e54c6d 100644
--- a/packages/superdough/synth.mjs
+++ b/packages/superdough/synth.mjs
@@ -12,7 +12,7 @@ import {
 } from './helpers.mjs';
 import { getNoiseMix, getNoiseOscillator } from './noise.mjs';
 
-export const getFrequencyFromValue = (value) => {
+const getFrequencyFromValue = (value) => {
   let { note, freq } = value;
   note = note || 36;
   if (typeof note === 'string') {
@@ -25,7 +25,7 @@ export const getFrequencyFromValue = (value) => {
 
   return Number(freq);
 };
-export function destroyAudioWorkletNode(node) {
+function destroyAudioWorkletNode(node) {
   if (node == null) {
     return;
   }
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index d8f189779..24f7434a9 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -4,7 +4,6 @@
 
 import OLAProcessor from './ola-processor';
 import FFT from './fft.js';
-import { Dough } from './dough.mjs';
 
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
 const _mod = (n, m) => ((n % m) + m) % m;
@@ -896,27 +895,3 @@ class ByteBeatProcessor extends AudioWorkletProcessor {
 }
 
 registerProcessor('byte-beat-processor', ByteBeatProcessor);
-
-class DoughProcessor extends AudioWorkletProcessor {
-  constructor() {
-    super();
-    this.dough = new Dough(sampleRate, currentTime);
-    this.port.onmessage = (event) => this.dough.scheduleSpawn(event.data);
-  }
-  process(inputs, outputs, params) {
-    if (this.disconnected) {
-      return false;
-    }
-    const output = outputs[0];
-    for (let i = 0; i < output[0].length; i++) {
-      this.dough.update();
-      for (let c = 0; c < output.length; c++) {
-        //prevent speaker blowout via clipping if threshold exceeds
-        output[c][i] = clamp(this.dough.channels[c], -1, 1);
-      }
-    }
-    return true; // keep the audio processing going
-  }
-}
-
-registerProcessor('dough-processor', DoughProcessor);
diff --git a/packages/superdough/.gitignore b/packages/supradough/.gitignore
similarity index 100%
rename from packages/superdough/.gitignore
rename to packages/supradough/.gitignore
diff --git a/packages/supradough/README.md b/packages/supradough/README.md
new file mode 100644
index 000000000..a8cfa84b3
--- /dev/null
+++ b/packages/supradough/README.md
@@ -0,0 +1,3 @@
+# supradough
+
+platform agnostic synth and sampler intended for live coding. a reimplementation of superdough.
\ No newline at end of file
diff --git a/packages/superdough/dough-export.mjs b/packages/supradough/dough-export.mjs
similarity index 100%
rename from packages/superdough/dough-export.mjs
rename to packages/supradough/dough-export.mjs
diff --git a/packages/supradough/dough-worklet.mjs b/packages/supradough/dough-worklet.mjs
new file mode 100644
index 000000000..0361afa0d
--- /dev/null
+++ b/packages/supradough/dough-worklet.mjs
@@ -0,0 +1,27 @@
+import { Dough } from './dough.mjs';
+
+const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
+
+class DoughProcessor extends AudioWorkletProcessor {
+  constructor() {
+    super();
+    this.dough = new Dough(sampleRate, currentTime);
+    this.port.onmessage = (event) => this.dough.scheduleSpawn(event.data);
+  }
+  process(inputs, outputs, params) {
+    if (this.disconnected) {
+      return false;
+    }
+    const output = outputs[0];
+    for (let i = 0; i < output[0].length; i++) {
+      this.dough.update();
+      for (let c = 0; c < output.length; c++) {
+        //prevent speaker blowout via clipping if threshold exceeds
+        output[c][i] = clamp(this.dough.channels[c], -1, 1);
+      }
+    }
+    return true; // keep the audio processing going
+  }
+}
+
+registerProcessor('dough-processor', DoughProcessor);
diff --git a/packages/superdough/dough.mjs b/packages/supradough/dough.mjs
similarity index 100%
rename from packages/superdough/dough.mjs
rename to packages/supradough/dough.mjs
diff --git a/packages/supradough/index.mjs b/packages/supradough/index.mjs
new file mode 100644
index 000000000..1bce17f6d
--- /dev/null
+++ b/packages/supradough/index.mjs
@@ -0,0 +1,4 @@
+import _workletUrl from './dough-worklet.mjs?audioworklet';
+
+export * from './dough.mjs';
+export const workletUrl = _workletUrl;
diff --git a/packages/supradough/package.json b/packages/supradough/package.json
new file mode 100644
index 000000000..7e465c0a9
--- /dev/null
+++ b/packages/supradough/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "supradough",
+  "version": "1.2.3",
+  "description": "platform agnostic synth and sampler intended for live coding. a reimplementation of superdough.",
+  "main": "index.mjs",
+  "type": "module",
+  "publishConfig": {
+    "main": "dist/index.mjs"
+  },
+  "scripts": {
+    "build": "vite build",
+    "prepublishOnly": "npm run build"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tidalcycles/strudel.git"
+  },
+  "keywords": [
+    "tidalcycles",
+    "strudel",
+    "pattern",
+    "livecoding",
+    "algorave"
+  ],
+  "author": "Felix Roos <flix91@gmail.com>",
+  "license": "AGPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/tidalcycles/strudel/issues"
+  },
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
+  "devDependencies": {
+    "vite": "^6.0.11",
+    "vite-plugin-bundle-audioworklet": "workspace:*",
+    "wav-encoder": "^1.3.0"
+  },
+  "dependencies": {}
+}
diff --git a/packages/webaudio/package.json b/packages/webaudio/package.json
index 5714fddf3..2617c2872 100644
--- a/packages/webaudio/package.json
+++ b/packages/webaudio/package.json
@@ -35,7 +35,8 @@
   "dependencies": {
     "@strudel/core": "workspace:*",
     "@strudel/draw": "workspace:*",
-    "superdough": "workspace:*"
+    "superdough": "workspace:*",
+    "supradough": "workspace:*"
   },
   "devDependencies": {
     "vite": "^6.0.11"
diff --git a/packages/webaudio/webaudio.mjs b/packages/webaudio/webaudio.mjs
index 8f7d041a9..de53bb5cd 100644
--- a/packages/webaudio/webaudio.mjs
+++ b/packages/webaudio/webaudio.mjs
@@ -5,8 +5,12 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import * as strudel from '@strudel/core';
-import { superdough, getAudioContext, setLogger, doughTrigger } from 'superdough';
+import { superdough, getAudioContext, setLogger, doughTrigger, registerWorklet } from 'superdough';
 import './supradough.mjs';
+import { workletUrl } from 'supradough';
+
+registerWorklet(workletUrl);
+
 const { Pattern, logger, repl } = strudel;
 
 setLogger(logger);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ed8a7c014..805412ede 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -485,6 +485,15 @@ importers:
       vite-plugin-bundle-audioworklet:
         specifier: workspace:*
         version: link:../vite-plugin-bundle-audioworklet
+
+  packages/supradough:
+    devDependencies:
+      vite:
+        specifier: ^6.0.11
+        version: 6.0.11(@types/node@22.10.10)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0)
+      vite-plugin-bundle-audioworklet:
+        specifier: workspace:*
+        version: link:../vite-plugin-bundle-audioworklet
       wav-encoder:
         specifier: ^1.3.0
         version: 1.3.0
@@ -597,6 +606,9 @@ importers:
       superdough:
         specifier: workspace:*
         version: link:../superdough
+      supradough:
+        specifier: workspace:*
+        version: link:../supradough
     devDependencies:
       vite:
         specifier: ^6.0.11

From 49f38aeddbf7ce2815805b7c9640df0ba848a0bb Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Fri, 6 Jun 2025 16:26:17 +0200
Subject: [PATCH 19/52] remove log

---
 packages/superdough/superdough.mjs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index a6e54435c..2629790df 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -200,7 +200,6 @@ function loadWorklets() {
   if (!workletsLoading) {
     const audioCtx = getAudioContext();
     const allWorkletURLs = externalWorklets.concat([workletsUrl]);
-    console.log('allWorkletURLs', allWorkletURLs);
     workletsLoading = Promise.all(allWorkletURLs.map((workletURL) => audioCtx.audioWorklet.addModule(workletURL)));
   }
 

From 1dac69635db5bf39324d2febdfc9aae45dc84706 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sat, 7 Jun 2025 10:40:34 +0200
Subject: [PATCH 20/52] feedback delay (still hard coded feedback / time
 values)

---
 packages/supradough/dough.mjs | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index a292b0c8b..ba00d672f 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -229,7 +229,7 @@ const MAX_DELAY_TIME = 10;
 export class Delay {
   writeIdx = 0;
   readIdx = 0;
-  buffer = new Float32Array(MAX_DELAY_TIME * SAMPLE_RATE); // .fill(0)
+  buffer = new Float32Array(MAX_DELAY_TIME * SAMPLE_RATE); //.fill(0)
   write(s, delayTime) {
     this.writeIdx = (this.writeIdx + 1) % this.buffer.length;
     this.buffer[this.writeIdx] = s;
@@ -479,19 +479,13 @@ export class DoughVoice {
     this.density = this.density ?? getDefaultValue('density');
     this.fanchor = this.fanchor ?? getDefaultValue('fanchor');
     this.drive = this.drive ?? 0.69;
-    this.resonance = this.resonance ?? getDefaultValue('resonance');
-    this.hresonance = this.hresonance ?? getDefaultValue('hresonance');
-    this.bandq = this.bandq ?? getDefaultValue('bandq');
     this.phaserdepth = this.phaserdepth ?? getDefaultValue('phaserdepth');
     this.shapevol = this.shapevol ?? getDefaultValue('shapevol');
     this.distortvol = this.distortvol ?? getDefaultValue('distortvol');
-    this.delay = this.delay ?? getDefaultValue('delay');
-    this.delayfeedback = this.delayfeedback ?? getDefaultValue('delayfeedback');
-    this.delaytime = this.delaytime ?? getDefaultValue('delaytime');
-    this.orbit = this.orbit ?? getDefaultValue('orbit');
     this.i = this.i ?? getDefaultValue('i');
     this.fft = this.fft ?? getDefaultValue('fft');
     this.pan = this.pan ?? getDefaultValue('pan');
+    this.orbit = this.orbit ?? getDefaultValue('orbit');
 
     [this.attack, this.decay, this.sustain, this.release] = getADSRValues([
       this.attack,
@@ -508,6 +502,7 @@ export class DoughVoice {
 
     // filter setup
     this._lpf = this.cutoff ? new TwoPoleFilter() : null;
+    this.resonance = this.resonance ?? getDefaultValue('resonance');
     if (this.lpenv) {
       this._lpenv = new ADSR();
       [this.lpattack, this.lpdecay, this.lpsustain, this.lprelease] = getADSRValues([
@@ -519,6 +514,7 @@ export class DoughVoice {
     }
 
     this._hpf = this.hcutoff ? new TwoPoleFilter() : null;
+    this.hresonance = this.hresonance ?? getDefaultValue('hresonance');
     if (this.hpenv) {
       this._hpenv = new ADSR();
       [this.hpattack, this.hpdecay, this.hpsustain, this.hprelease] = getADSRValues([
@@ -529,6 +525,7 @@ export class DoughVoice {
       ]);
     }
     this._bpf = this.bandf ? new TwoPoleFilter() : null;
+    this.bandq = this.bandq ?? getDefaultValue('bandq');
     if (this.bpenv) {
       this._bpenv = new ADSR();
       [this.bpattack, this.bpdecay, this.bpsustain, this.bprelease] = getADSRValues([
@@ -547,6 +544,12 @@ export class DoughVoice {
     this._crush = this.crush ? new Crush() : null;
     this._distort = this.distort ? new Distort() : null;
 
+    // delay
+    this.delay = this.delay ?? getDefaultValue('delay');
+    this.delayfeedback = this.delayfeedback ?? getDefaultValue('delayfeedback');
+    this.delaytime = this.delaytime ?? getDefaultValue('delaytime');
+
+    // precalculated values
     this.piOverSr = Math.PI / value.sampleRate;
     this.eighthOverLogHalf = 0.125 / Math.log(0.5);
   }
@@ -631,12 +634,17 @@ export class Dough {
   vid = 0;
   q = [];
   channels = [0, 0];
+  delaysend = [0, 0];
+  delaytime = getDefaultValue('delaytime');
+  delayfeedback = getDefaultValue('delayfeedback');
   t = 0;
   // sampleRate: number, currentTime: number (seconds)
   constructor(sampleRate = 48000, currentTime = 0) {
     this.sampleRate = sampleRate;
     this.t = Math.floor(currentTime * sampleRate); // samples
     // console.log('init dough', this.sampleRate, this.t);
+    this._delayL = new Delay();
+    this._delayR = new Delay();
   }
   scheduleSpawn(value) {
     if (value._begin === undefined) {
@@ -696,7 +704,18 @@ export class Dough {
       this.voices[v].update(this.t / this.sampleRate);
       this.channels[0] += this.voices[v].l;
       this.channels[1] += this.voices[v].r;
+      if (this.voices[v].delay) {
+        this.delaysend[0] += this.voices[v].l * this.voices[v].delay;
+        this.delaysend[1] += this.voices[v].r * this.voices[v].delay;
+      }
     }
+    // todo: how to change delaytime / delayfeedback from a voice?
+    const delayL = this._delayL.update(this.delaysend[0], this.delaytime);
+    const delayR = this._delayR.update(this.delaysend[1], this.delaytime);
+    this.delaysend[0] = delayL * this.delayfeedback;
+    this.delaysend[1] = delayR * this.delayfeedback;
+    this.channels[0] += delayL;
+    this.channels[1] += delayR;
     this.t++;
   }
 }

From d743570546d3659cd949441180e4a79df2fd023f Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sat, 7 Jun 2025 13:12:35 +0200
Subject: [PATCH 21/52] set delay time and feedback from voice

---
 packages/supradough/dough.mjs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index ba00d672f..14bab22fe 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -707,6 +707,8 @@ export class Dough {
       if (this.voices[v].delay) {
         this.delaysend[0] += this.voices[v].l * this.voices[v].delay;
         this.delaysend[1] += this.voices[v].r * this.voices[v].delay;
+        this.delaytime = this.voices[v].delaytime; // we trust that these are initialized in the voice
+        this.delayfeedback = this.voices[v].delayfeedback;
       }
     }
     // todo: how to change delaytime / delayfeedback from a voice?

From e54449f5f73cf0d41ff14f460bdd4ca9ccfa59eb Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sat, 7 Jun 2025 13:24:06 +0200
Subject: [PATCH 22/52] white brown pink noise + crackle alias for dust

---
 packages/supradough/dough.mjs | 49 +++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 14bab22fe..2050054ec 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -108,6 +108,51 @@ export class Dust {
   update = (density) => (Math.random() < density * ISR ? Math.random() : 0);
 }
 
+export class WhiteNoise {
+  update() {
+    return Math.random() * 2 - 1;
+  }
+}
+
+export class BrownNoise {
+  constructor() {
+    this.out = 0;
+  }
+  update() {
+    let white = Math.random() * 2 - 1;
+    this.out = (this.out + 0.02 * white) / 1.02;
+    return this.out;
+  }
+}
+
+export class PinkNoise {
+  constructor() {
+    this.b0 = 0;
+    this.b1 = 0;
+    this.b2 = 0;
+    this.b3 = 0;
+    this.b4 = 0;
+    this.b5 = 0;
+    this.b6 = 0;
+  }
+
+  update() {
+    const white = Math.random() * 2 - 1;
+
+    this.b0 = 0.99886 * this.b0 + white * 0.0555179;
+    this.b1 = 0.99332 * this.b1 + white * 0.0750759;
+    this.b2 = 0.969 * this.b2 + white * 0.153852;
+    this.b3 = 0.8665 * this.b3 + white * 0.3104856;
+    this.b4 = 0.55 * this.b4 + white * 0.5329522;
+    this.b5 = -0.7616 * this.b5 - white * 0.016898;
+
+    const pink = this.b0 + this.b1 + this.b2 + this.b3 + this.b4 + this.b5 + this.b6 + white * 0.5362;
+    this.b6 = white * 0.115926;
+
+    return pink * 0.11;
+  }
+}
+
 export class Impulse {
   phase = 1;
   update(freq) {
@@ -369,7 +414,11 @@ let oscillators = {
   pulse: PulseOsc,
   pulze: PulzeOsc,
   dust: Dust,
+  crackle: Dust,
   impulse: Impulse,
+  white: WhiteNoise,
+  brown: BrownNoise,
+  pink: PinkNoise,
 };
 
 const defaultDefaultValues = {

From 77463a199aaf68d2d32b4653b2c49443958be9f7 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sat, 7 Jun 2025 13:26:43 +0200
Subject: [PATCH 23/52] add square alias for pulse

---
 packages/supradough/dough.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 2050054ec..0c0e667d9 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -412,6 +412,7 @@ let oscillators = {
   tri: TriOsc,
   triangle: TriOsc,
   pulse: PulseOsc,
+  square: PulseOsc,
   pulze: PulzeOsc,
   dust: Dust,
   crackle: Dust,

From b000f2297d23ddc4b46b8fa5ad4848d504652ea8 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sat, 7 Jun 2025 20:31:47 +0200
Subject: [PATCH 24/52] fm

---
 packages/supradough/dough.mjs | 36 ++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 0c0e667d9..08469e634 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -449,6 +449,7 @@ const defaultDefaultValues = {
   fft: 8,
   z: 'triangle',
   pan: 0.5,
+  fmh: 1,
 };
 
 let getDefaultValue = (key) => defaultDefaultValues[key];
@@ -518,6 +519,8 @@ export class DoughVoice {
     roomsize,
     ir,
     analyze,
+    fmh,
+    fmi
     */
     value.freq = getFrequency(value);
     Object.assign(this, value);
@@ -550,6 +553,20 @@ export class DoughVoice {
     const SourceClass = oscillators[this.s] ?? TriOsc;
     this._sound = new SourceClass();
 
+    if (this.fmi) {
+      this._fm = new SineOsc();
+      this.fmh = this.fmh ?? getDefaultValue('fmh');
+      if (this.fmenv) {
+        this._fmenv = new ADSR();
+        [this.fmattack, this.fmdecay, this.fmsustain, this.fmrelease] = getADSRValues([
+          this.fmattack,
+          this.fmdecay,
+          this.fmsustain,
+          this.fmrelease,
+        ]);
+      }
+    }
+
     // filter setup
     this._lpf = this.cutoff ? new TwoPoleFilter() : null;
     this.resonance = this.resonance ?? getDefaultValue('resonance');
@@ -613,13 +630,26 @@ export class DoughVoice {
       return 0;
     }
     let s = 0;
+    let gate = Number(t >= this._begin && t <= this._holdEnd);
+
+    let freq = this.freq;
+    if (this._fm) {
+      let fmi = this.fmi;
+      if (this._fmenv) {
+        const env = this._fmenv.update(t, gate, this.fmattack, this.fmdecay, this.fmsustain, this.fmrelease) ** 2;
+        fmi = /* 2 ** */ this.fmenv * env * fmi; // todo: find good scaling
+      }
+      const modfreq = freq * this.fmh;
+      const modgain = modfreq * fmi;
+      freq = freq + this._fm.update(modfreq) * modgain;
+    }
+
     // sound source
     if (this.s === 'pulse') {
-      s = this._sound.update(this.freq, this.pw ?? 0.5);
+      s = this._sound.update(freq, this.pw ?? 0.5);
     } else {
-      s = this._sound.update(this.freq);
+      s = this._sound.update(freq);
     }
-    let gate = Number(t >= this._begin && t <= this._holdEnd);
     s = s * this.gain * this.velocity;
 
     // lpf

From 2f2bf5bf29541ea1c4edee5e70302b109f54ce0b Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sat, 7 Jun 2025 22:36:54 +0200
Subject: [PATCH 25/52] fix: note2midi for notes without octave

---
 packages/supradough/dough.mjs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 08469e634..2853f3971 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -457,7 +457,7 @@ let getDefaultValue = (key) => defaultDefaultValues[key];
 const chromas = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 };
 const accs = { '#': 1, b: -1, s: 1, f: -1 };
 const note2midi = (note, defaultOctave = 3) => {
-  const [pc, acc = '', oct = defaultOctave] =
+  let [pc, acc = '', oct = ''] =
     String(note)
       .match(/^([a-gA-G])([#bsf]*)([0-9]*)$/)
       ?.slice(1) || [];
@@ -466,13 +466,14 @@ const note2midi = (note, defaultOctave = 3) => {
   }
   const chroma = chromas[pc.toLowerCase()];
   const offset = acc?.split('').reduce((o, char) => o + accs[char], 0) || 0;
-  return (Number(oct) + 1) * 12 + chroma + offset;
+  oct = Number(oct || defaultOctave);
+  return (oct + 1) * 12 + chroma + offset;
 };
 const getFrequency = (value) => {
   let { note, freq } = value;
   note = note || 36;
   if (typeof note === 'string') {
-    note = note2midi(note); // e.g. c3 => 48
+    note = note2midi(note, 3); // e.g. c3 => 48
   }
   if (!freq && typeof note === 'number') {
     freq = Math.pow(2, (note - 69) / 12) * 440;

From 5988e3d3b48541444440f6c165ea1b37ed22ff02 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sat, 7 Jun 2025 22:42:48 +0200
Subject: [PATCH 26/52] fix: hot reloading for dough.mjs (see comment)

---
 packages/supradough/index.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/supradough/index.mjs b/packages/supradough/index.mjs
index 1bce17f6d..54a835495 100644
--- a/packages/supradough/index.mjs
+++ b/packages/supradough/index.mjs
@@ -1,4 +1,4 @@
-import _workletUrl from './dough-worklet.mjs?audioworklet';
+import _workletUrl from './dough-worklet.mjs?url'; // todo: change ?url to ?audioworklet before build (?audioworklet doesn't hot reload)
 
 export * from './dough.mjs';
 export const workletUrl = _workletUrl;

From ab052ce1ac6fe4232edd65e877dc2cb041df0d48 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sat, 7 Jun 2025 23:15:09 +0200
Subject: [PATCH 27/52] fix: polyblepped sawtooth + fm = death

---
 packages/supradough/dough.mjs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 2853f3971..826172a2f 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -450,6 +450,7 @@ const defaultDefaultValues = {
   z: 'triangle',
   pan: 0.5,
   fmh: 1,
+  fmenv: 0, // differs from superdough
 };
 
 let getDefaultValue = (key) => defaultDefaultValues[key];
@@ -540,6 +541,7 @@ export class DoughVoice {
     this.fft = this.fft ?? getDefaultValue('fft');
     this.pan = this.pan ?? getDefaultValue('pan');
     this.orbit = this.orbit ?? getDefaultValue('orbit');
+    this.fmenv = this.fmenv ?? getDefaultValue('fmenv');
 
     [this.attack, this.decay, this.sustain, this.release] = getADSRValues([
       this.attack,
@@ -551,6 +553,9 @@ export class DoughVoice {
     this._holdEnd = this._begin + this._duration; // needed for gate
     this._end = this._holdEnd + this.release + 0.01; // needed for despawn
 
+    if (this.s === 'saw' || this.s === 'sawtooth') {
+      this.s = 'zaw'; // polyblepped saw when fm is applied
+    }
     const SourceClass = oscillators[this.s] ?? TriOsc;
     this._sound = new SourceClass();
 
@@ -638,7 +643,7 @@ export class DoughVoice {
       let fmi = this.fmi;
       if (this._fmenv) {
         const env = this._fmenv.update(t, gate, this.fmattack, this.fmdecay, this.fmsustain, this.fmrelease) ** 2;
-        fmi = /* 2 ** */ this.fmenv * env * fmi; // todo: find good scaling
+        fmi = this.fmenv * env * fmi;
       }
       const modfreq = freq * this.fmh;
       const modgain = modfreq * fmi;

From ac7ee376e5a0ed121526096baa3839a2e117aebe Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sun, 8 Jun 2025 00:43:58 +0200
Subject: [PATCH 28/52] pitch envelope

---
 packages/supradough/dough.mjs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 826172a2f..809b8d52b 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -559,6 +559,16 @@ export class DoughVoice {
     const SourceClass = oscillators[this.s] ?? TriOsc;
     this._sound = new SourceClass();
 
+    if (this.penv) {
+      this._penv = new ADSR();
+      [this.pattack, this.pdecay, this.psustain, this.prelease] = getADSRValues([
+        this.pattack,
+        this.pdecay,
+        this.psustain,
+        this.prelease,
+      ]);
+    }
+
     if (this.fmi) {
       this._fm = new SineOsc();
       this.fmh = this.fmh ?? getDefaultValue('fmh');
@@ -650,6 +660,11 @@ export class DoughVoice {
       freq = freq + this._fm.update(modfreq) * modgain;
     }
 
+    if (this._penv) {
+      const env = this._penv.update(t, gate, this.pattack, this.pdecay, this.psustain, this.prelease) ** 2;
+      freq = freq + env * this.penv;
+    }
+
     // sound source
     if (this.s === 'pulse') {
       s = this._sound.update(freq, this.pw ?? 0.5);

From 0f2aa9569b9cabc3c1144e01c5586e4099baab0d Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sun, 8 Jun 2025 02:04:49 +0200
Subject: [PATCH 29/52] half working samples

---
 packages/supradough/dough-worklet.mjs |  14 ++-
 packages/supradough/dough.mjs         |  41 ++++++--
 packages/webaudio/index.mjs           |   1 +
 packages/webaudio/supradough.mjs      | 138 +++++++++++++++++++++++++-
 4 files changed, 182 insertions(+), 12 deletions(-)

diff --git a/packages/supradough/dough-worklet.mjs b/packages/supradough/dough-worklet.mjs
index 0361afa0d..97a35c487 100644
--- a/packages/supradough/dough-worklet.mjs
+++ b/packages/supradough/dough-worklet.mjs
@@ -6,7 +6,19 @@ class DoughProcessor extends AudioWorkletProcessor {
   constructor() {
     super();
     this.dough = new Dough(sampleRate, currentTime);
-    this.port.onmessage = (event) => this.dough.scheduleSpawn(event.data);
+    this.port.onmessage = (event) => {
+      if (event.data.spawn) {
+        this.dough.scheduleSpawn(event.data.spawn);
+      } else if (event.data.sample) {
+        this.dough.loadSample(event.data.sample, event.data.channels);
+      } else if (event.data.samples) {
+        event.data.samples.forEach(([name, channels]) => {
+          this.dough.loadSample(name, channels);
+        });
+      } else {
+        console.log('unrecognized event type', event.data);
+      }
+    };
   }
   process(inputs, outputs, params) {
     if (this.disconnected) {
diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 809b8d52b..e42b4f8e8 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -383,6 +383,19 @@ export class Distort {
 }
 // distortion could be expressed as a function, because it's stateless
 
+export class BufferPlayer {
+  channels = [];
+  pos = 0;
+  update(freq, channel = 0) {
+    if (this.pos >= this.channels[channel].length) {
+      return 0;
+    }
+    let s = this.channels[channel][this.pos];
+    this.pos++;
+    return s;
+  }
+}
+
 export function _rangex(sig, min, max) {
   let logmin = Math.log(min);
   let range = Math.log(max) - logmin;
@@ -403,7 +416,7 @@ export const getADSRValues = (params, curve = 'linear', defaultValues) => {
   return [Math.max(a ?? 0, envmin), Math.max(d ?? 0, envmin), Math.min(sustain, envmax), Math.max(r ?? 0, releaseMin)];
 };
 
-let oscillators = {
+let shapes = {
   sine: SineOsc,
   saw: SawOsc,
   zaw: ZawOsc,
@@ -553,11 +566,20 @@ export class DoughVoice {
     this._holdEnd = this._begin + this._duration; // needed for gate
     this._end = this._holdEnd + this.release + 0.01; // needed for despawn
 
+    this.s ??= 'triangle';
     if (this.s === 'saw' || this.s === 'sawtooth') {
       this.s = 'zaw'; // polyblepped saw when fm is applied
     }
-    const SourceClass = oscillators[this.s] ?? TriOsc;
-    this._sound = new SourceClass();
+    if (shapes[this.s]) {
+      const SourceClass = shapes[this.s];
+      this._sound = new SourceClass();
+    } else if (value.samples.has(this.s)) {
+      this._sample = new BufferPlayer();
+      this._sample.channels = value.samples.get(this.s);
+      this._sample.pos = 0;
+    } else {
+      console.warn('sound not found', this.s);
+    }
 
     if (this.penv) {
       this._penv = new ADSR();
@@ -642,7 +664,7 @@ export class DoughVoice {
     return 1 - Math.log(c) * this.eighthOverLogHalf;
   }
   update(t) {
-    if (!this._sound) {
+    if (!this._sound && !this._sample) {
       return 0;
     }
     let s = 0;
@@ -666,10 +688,12 @@ export class DoughVoice {
     }
 
     // sound source
-    if (this.s === 'pulse') {
+    if (this._sound && this.s === 'pulse') {
       s = this._sound.update(freq, this.pw ?? 0.5);
-    } else {
+    } else if (this._sound) {
       s = this._sound.update(freq);
+    } else if (this._sample) {
+      s = this._sample.update(freq, 0); // tbd: stereo samples...
     }
     s = s * this.gain * this.velocity;
 
@@ -738,6 +762,7 @@ export class Dough {
   delaysend = [0, 0];
   delaytime = getDefaultValue('delaytime');
   delayfeedback = getDefaultValue('delayfeedback');
+  samples = new Map();
   t = 0;
   // sampleRate: number, currentTime: number (seconds)
   constructor(sampleRate = 48000, currentTime = 0) {
@@ -747,6 +772,9 @@ export class Dough {
     this._delayL = new Delay();
     this._delayR = new Delay();
   }
+  loadSample(name, channels) {
+    this.samples.set(name, channels);
+  }
   scheduleSpawn(value) {
     if (value._begin === undefined) {
       throw new Error('[dough]: scheduleSpawn expected _begin to be set');
@@ -760,6 +788,7 @@ export class Dough {
   }
   spawn(value) {
     value.id = this.vid++;
+    value.samples = this.samples;
     const voice = new DoughVoice(value);
     this.voices.push(voice);
     // console.log('spawn', voice.id, 'voices:', this.voices.length);
diff --git a/packages/webaudio/index.mjs b/packages/webaudio/index.mjs
index 59672b617..f89e12696 100644
--- a/packages/webaudio/index.mjs
+++ b/packages/webaudio/index.mjs
@@ -7,4 +7,5 @@ This program is free software: you can redistribute it and/or modify it under th
 export * from './webaudio.mjs';
 export * from './scope.mjs';
 export * from './spectrum.mjs';
+export * from './supradough.mjs';
 export * from 'superdough';
diff --git a/packages/webaudio/supradough.mjs b/packages/webaudio/supradough.mjs
index 8df18bed6..38b2330c3 100644
--- a/packages/webaudio/supradough.mjs
+++ b/packages/webaudio/supradough.mjs
@@ -20,10 +20,138 @@ Pattern.prototype.supradough = function () {
   return this.onTrigger((_, hap, __, cps, begin) => {
     hap.value._begin = begin;
     hap.value._duration = hap.duration / cps;
-
-    if (!doughWorklet) {
-      initDoughWorklet();
-    }
-    doughWorklet.port.postMessage(hap.value);
+    !doughWorklet && initDoughWorklet();
+    doughWorklet.port.postMessage({ spawn: hap.value });
   }, 1);
 };
+
+async function loadSampleChannels(url) {
+  const buffer = await fetch(url)
+    .then((res) => res.arrayBuffer())
+    .then((buf) => getAudioContext().decodeAudioData(buf));
+  // console.log('buffer', buffer, buffer.numberOfChannels);
+  let channels = [];
+  for (let i = 0; i < buffer.numberOfChannels; i++) {
+    channels.push(buffer.getChannelData(i));
+  }
+  return channels;
+}
+
+let samples = {
+  casio: [
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/casio/high.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/casio/low.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/casio/noise.wav',
+  ],
+  crow: [
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/crow/000_crow.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/crow/001_crow2.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/crow/002_crow3.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/crow/003_crow4.wav',
+  ],
+  insect: [
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/insect/000_everglades_conehead.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/insect/001_robust_shieldback.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/insect/002_seashore_meadow_katydid.wav',
+  ],
+  wind: [
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/000_wind1.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/001_wind10.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/002_wind2.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/003_wind3.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/004_wind4.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/005_wind5.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/006_wind6.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/007_wind7.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/008_wind8.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/009_wind9.wav',
+  ],
+  jazz: [
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/000_BD.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/001_CB.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/002_FX.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/003_HH.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/004_OH.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/005_P1.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/006_P2.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/007_SN.wav',
+  ],
+  metal: [
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/000_0.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/001_1.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/002_2.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/003_3.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/004_4.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/005_5.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/006_6.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/007_7.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/008_8.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/009_9.wav',
+  ],
+  east: [
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/000_nipon_wood_block.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/001_ohkawa_mute.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/002_ohkawa_open.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/003_shime_hi.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/004_shime_hi_2.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/005_shime_mute.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/006_taiko_1.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/007_taiko_2.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/008_taiko_3.wav',
+  ],
+  space: [
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/000_0.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/001_1.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/002_11.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/003_12.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/004_13.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/005_14.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/006_15.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/007_16.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/008_17.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/009_18.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/010_2.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/011_3.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/012_4.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/013_5.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/014_6.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/015_7.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/016_8.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/017_9.wav',
+  ],
+  numbers: [
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/0.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/1.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/2.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/3.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/4.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/5.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/6.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/7.wav',
+    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/8.wav',
+  ],
+  piano: ['https://raw.githubusercontent.com/felixroos/dough-samples/refs/heads/main/piano/A3v8.mp3'],
+  flute: ['https://raw.githubusercontent.com/felixroos/samples/refs/heads/main/flute/c4.mp3'],
+  bd: [
+    'https://raw.githubusercontent.com/geikha/tidal-drum-machines/15eac73c5e878550f91d864a4863e014799403f1/machines/RolandTR909/rolandtr909-bd/Bassdrum-01.wav',
+  ],
+};
+// for some reason, only piano and flute work.. is it because mp3??
+
+let loaded = false;
+export async function doughsample() {
+  !doughWorklet && initDoughWorklet();
+  if (loaded) {
+    return;
+  }
+  loaded = true;
+  const sampleMap = await Promise.all(
+    Object.entries(samples).map(async ([key, url]) => {
+      url = url[0];
+      console.log(key, 'url', url);
+      return [key, await loadSampleChannels(url)];
+    }),
+  );
+  console.log('sampleMap', sampleMap);
+  doughWorklet.port.postMessage({ samples: sampleMap });
+}

From 356d4360ecbbe09a21b697de7c563a4387b572cd Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sun, 8 Jun 2025 09:05:14 +0200
Subject: [PATCH 30/52] fix: scheduling + sample playback

---
 packages/supradough/dough.mjs    | 14 ++++++--------
 packages/webaudio/supradough.mjs | 28 ++++++++++++++--------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index e42b4f8e8..dc083bac7 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -384,6 +384,7 @@ export class Distort {
 // distortion could be expressed as a function, because it's stateless
 
 export class BufferPlayer {
+  static samples = new Map();
   channels = [];
   pos = 0;
   update(freq, channel = 0) {
@@ -573,10 +574,9 @@ export class DoughVoice {
     if (shapes[this.s]) {
       const SourceClass = shapes[this.s];
       this._sound = new SourceClass();
-    } else if (value.samples.has(this.s)) {
+    } else if (BufferPlayer.samples.has(this.s)) {
       this._sample = new BufferPlayer();
-      this._sample.channels = value.samples.get(this.s);
-      this._sample.pos = 0;
+      this._sample.channels = BufferPlayer.samples.get(this.s);
     } else {
       console.warn('sound not found', this.s);
     }
@@ -735,7 +735,6 @@ export class DoughVoice {
     this._crush && (s = this._crush.update(s, this.crush));
     this._distort && (s = this._distort.update(s, this.distort, this.distortvol));
 
-    /* Math.random() > 0.99 && console.log('gate', gate); */
     const env = this._adsr.update(t, gate, this.attack, this.decay, this.sustain, this.release);
     s = s * env;
 
@@ -762,7 +761,6 @@ export class Dough {
   delaysend = [0, 0];
   delaytime = getDefaultValue('delaytime');
   delayfeedback = getDefaultValue('delayfeedback');
-  samples = new Map();
   t = 0;
   // sampleRate: number, currentTime: number (seconds)
   constructor(sampleRate = 48000, currentTime = 0) {
@@ -773,7 +771,7 @@ export class Dough {
     this._delayR = new Delay();
   }
   loadSample(name, channels) {
-    this.samples.set(name, channels);
+    BufferPlayer.samples.set(name, channels);
   }
   scheduleSpawn(value) {
     if (value._begin === undefined) {
@@ -783,12 +781,12 @@ export class Dough {
       throw new Error('[dough]: scheduleSpawn expected _duration to be set');
     }
     value.sampleRate = this.sampleRate;
-    const time = value._begin; // set from supradough.mjs
+    // convert seconds to samples
+    const time = Math.floor(value._begin * this.sampleRate); // set from supradough.mjs
     this.schedule({ time, type: 'spawn', arg: value });
   }
   spawn(value) {
     value.id = this.vid++;
-    value.samples = this.samples;
     const voice = new DoughVoice(value);
     this.voices.push(voice);
     // console.log('spawn', voice.id, 'voices:', this.voices.length);
diff --git a/packages/webaudio/supradough.mjs b/packages/webaudio/supradough.mjs
index 38b2330c3..317f3aa31 100644
--- a/packages/webaudio/supradough.mjs
+++ b/packages/webaudio/supradough.mjs
@@ -25,18 +25,6 @@ Pattern.prototype.supradough = function () {
   }, 1);
 };
 
-async function loadSampleChannels(url) {
-  const buffer = await fetch(url)
-    .then((res) => res.arrayBuffer())
-    .then((buf) => getAudioContext().decodeAudioData(buf));
-  // console.log('buffer', buffer, buffer.numberOfChannels);
-  let channels = [];
-  for (let i = 0; i < buffer.numberOfChannels; i++) {
-    channels.push(buffer.getChannelData(i));
-  }
-  return channels;
-}
-
 let samples = {
   casio: [
     'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/casio/high.wav',
@@ -138,6 +126,17 @@ let samples = {
 };
 // for some reason, only piano and flute work.. is it because mp3??
 
+async function loadSampleChannels(url) {
+  const buffer = await fetch(url)
+    .then((res) => res.arrayBuffer())
+    .then((buf) => getAudioContext().decodeAudioData(buf));
+  let channels = [];
+  for (let i = 0; i < buffer.numberOfChannels; i++) {
+    channels.push(buffer.getChannelData(i));
+  }
+  return channels;
+}
+
 let loaded = false;
 export async function doughsample() {
   !doughWorklet && initDoughWorklet();
@@ -148,8 +147,9 @@ export async function doughsample() {
   const sampleMap = await Promise.all(
     Object.entries(samples).map(async ([key, url]) => {
       url = url[0];
-      console.log(key, 'url', url);
-      return [key, await loadSampleChannels(url)];
+      const channels = await loadSampleChannels(url);
+      // console.log(key, 'url', url, channels);
+      return [key, channels];
     }),
   );
   console.log('sampleMap', sampleMap);

From 55aef1885117a94c4a153368f3b29f762a698db8 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sun, 8 Jun 2025 14:43:23 +0200
Subject: [PATCH 31/52] buffers can now be repitched (still with aliasing)

---
 packages/supradough/dough-worklet.mjs |  6 +++---
 packages/supradough/dough.mjs         | 22 ++++++++++++++--------
 packages/webaudio/supradough.mjs      | 10 ++++------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/packages/supradough/dough-worklet.mjs b/packages/supradough/dough-worklet.mjs
index 97a35c487..dd2315628 100644
--- a/packages/supradough/dough-worklet.mjs
+++ b/packages/supradough/dough-worklet.mjs
@@ -10,10 +10,10 @@ class DoughProcessor extends AudioWorkletProcessor {
       if (event.data.spawn) {
         this.dough.scheduleSpawn(event.data.spawn);
       } else if (event.data.sample) {
-        this.dough.loadSample(event.data.sample, event.data.channels);
+        this.dough.loadSample(event.data.sample, event.data.channels, event.data.sampleRate);
       } else if (event.data.samples) {
-        event.data.samples.forEach(([name, channels]) => {
-          this.dough.loadSample(name, channels);
+        event.data.samples.forEach(([name, channels, sampleRate]) => {
+          this.dough.loadSample(name, channels, sampleRate);
         });
       } else {
         console.log('unrecognized event type', event.data);
diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index dc083bac7..b378ee70e 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -385,14 +385,16 @@ export class Distort {
 
 export class BufferPlayer {
   static samples = new Map();
-  channels = [];
+  buffer; // { channels: Float32Array, sampleRate: number }
   pos = 0;
+  sampleFreq = 261.626; // middle c
   update(freq, channel = 0) {
-    if (this.pos >= this.channels[channel].length) {
+    if (this.pos >= this.buffer.channels[channel].length) {
       return 0;
     }
-    let s = this.channels[channel][this.pos];
-    this.pos++;
+    const speed = ((freq / this.sampleFreq) * this.buffer.sampleRate) / SAMPLE_RATE;
+    let s = this.buffer.channels[channel][Math.floor(this.pos)];
+    this.pos = this.pos + speed;
     return s;
   }
 }
@@ -576,7 +578,8 @@ export class DoughVoice {
       this._sound = new SourceClass();
     } else if (BufferPlayer.samples.has(this.s)) {
       this._sample = new BufferPlayer();
-      this._sample.channels = BufferPlayer.samples.get(this.s);
+      const buffer = BufferPlayer.samples.get(this.s);
+      this._sample.buffer = buffer;
     } else {
       console.warn('sound not found', this.s);
     }
@@ -738,7 +741,10 @@ export class DoughVoice {
     const env = this._adsr.update(t, gate, this.attack, this.decay, this.sustain, this.release);
     s = s * env;
 
-    s = s * this.postgain * 0.2;
+    s = s * this.postgain;
+    if (!this._sample) {
+      s = s * 0.2; // turn down waveforms
+    }
 
     if (this.pan === 0.5) {
       this.l = this.r = s; // mono
@@ -770,8 +776,8 @@ export class Dough {
     this._delayL = new Delay();
     this._delayR = new Delay();
   }
-  loadSample(name, channels) {
-    BufferPlayer.samples.set(name, channels);
+  loadSample(name, channels, sampleRate) {
+    BufferPlayer.samples.set(name, { channels, sampleRate });
   }
   scheduleSpawn(value) {
     if (value._begin === undefined) {
diff --git a/packages/webaudio/supradough.mjs b/packages/webaudio/supradough.mjs
index 317f3aa31..269dcda95 100644
--- a/packages/webaudio/supradough.mjs
+++ b/packages/webaudio/supradough.mjs
@@ -118,7 +118,7 @@ let samples = {
     'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/7.wav',
     'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/8.wav',
   ],
-  piano: ['https://raw.githubusercontent.com/felixroos/dough-samples/refs/heads/main/piano/A3v8.mp3'],
+  piano: ['https://raw.githubusercontent.com/felixroos/dough-samples/refs/heads/main/piano/C3v8.mp3'],
   flute: ['https://raw.githubusercontent.com/felixroos/samples/refs/heads/main/flute/c4.mp3'],
   bd: [
     'https://raw.githubusercontent.com/geikha/tidal-drum-machines/15eac73c5e878550f91d864a4863e014799403f1/machines/RolandTR909/rolandtr909-bd/Bassdrum-01.wav',
@@ -126,7 +126,7 @@ let samples = {
 };
 // for some reason, only piano and flute work.. is it because mp3??
 
-async function loadSampleChannels(url) {
+async function loadSampleChannels(key, url) {
   const buffer = await fetch(url)
     .then((res) => res.arrayBuffer())
     .then((buf) => getAudioContext().decodeAudioData(buf));
@@ -134,7 +134,7 @@ async function loadSampleChannels(url) {
   for (let i = 0; i < buffer.numberOfChannels; i++) {
     channels.push(buffer.getChannelData(i));
   }
-  return channels;
+  return [key, channels, buffer.sampleRate];
 }
 
 let loaded = false;
@@ -147,9 +147,7 @@ export async function doughsample() {
   const sampleMap = await Promise.all(
     Object.entries(samples).map(async ([key, url]) => {
       url = url[0];
-      const channels = await loadSampleChannels(url);
-      // console.log(key, 'url', url, channels);
-      return [key, channels];
+      return loadSampleChannels(key, url);
     }),
   );
   console.log('sampleMap', sampleMap);

From ec9109dd892386c65e3a374da48ed8eb0df53b59 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sun, 8 Jun 2025 19:24:55 +0200
Subject: [PATCH 32/52] exponential lerp

---
 packages/supradough/dough.mjs | 38 ++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 08469e634..7ee353277 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -192,16 +192,30 @@ export class Hold {
   }
 }
 
-function lerp(x, y0, y1) {
+function lerp(x, y0, y1, exponent = 1) {
+  if (x <= 0) return y0;
   if (x >= 1) return y1;
 
-  return y0 + x * (y1 - y0);
+  let curvedX;
+
+  if (exponent === 0) {
+    curvedX = x; // linear
+  } else if (exponent > 0) {
+    curvedX = Math.pow(x, exponent); // ease-in
+  } else {
+    curvedX = 1 - Math.pow(1 - x, -exponent); // ease-out
+  }
+
+  return y0 + (y1 - y0) * curvedX;
 }
 
 export class ADSR {
-  state = 'off';
-  startTime = 0;
-  startVal = 0;
+  constructor(props = {}) {
+    this.state = 'off'
+    this.startTime = 0;
+    this.startVal = 0;
+    this.curve = props.curve ?? 1;
+  }
 
   update(curTime, gate, attack, decay, susVal, release) {
     switch (this.state) {
@@ -220,11 +234,11 @@ export class ADSR {
           this.startTime = curTime;
           return 1;
         }
-        return lerp(time / attack, this.startVal, 1);
+        return lerp(time / attack, this.startVal, 1, this.curve);
       }
       case 'decay': {
         let time = curTime - this.startTime;
-        let curVal = lerp(time / decay, 1, susVal);
+        let curVal = lerp(time / decay, 1, susVal, -this.curve);
         if (gate <= 0) {
           this.state = 'release';
           this.startTime = curTime;
@@ -253,7 +267,7 @@ export class ADSR {
           this.state = 'off';
           return 0;
         }
-        let curVal = lerp(time / release, this.startVal, 0);
+        let curVal = lerp(time / release, this.startVal, 0, -this.curve);
         if (gate > 0) {
           this.state = 'attack';
           this.startTime = curTime;
@@ -564,6 +578,7 @@ export class DoughVoice {
           this.fmsustain,
           this.fmrelease,
         ]);
+      
       }
     }
 
@@ -571,7 +586,9 @@ export class DoughVoice {
     this._lpf = this.cutoff ? new TwoPoleFilter() : null;
     this.resonance = this.resonance ?? getDefaultValue('resonance');
     if (this.lpenv) {
-      this._lpenv = new ADSR();
+
+      this._lpenv = new ADSR({curve: 4});
+    
       [this.lpattack, this.lpdecay, this.lpsustain, this.lprelease] = getADSRValues([
         this.lpattack,
         this.lpdecay,
@@ -584,6 +601,7 @@ export class DoughVoice {
     this.hresonance = this.hresonance ?? getDefaultValue('hresonance');
     if (this.hpenv) {
       this._hpenv = new ADSR();
+    
       [this.hpattack, this.hpdecay, this.hpsustain, this.hprelease] = getADSRValues([
         this.hpattack,
         this.hpdecay,
@@ -604,7 +622,7 @@ export class DoughVoice {
     }
 
     // gain envelope
-    this._adsr = new ADSR();
+    this._adsr = new ADSR({curve: 2});
 
     // fx setup
     this._coarse = this.coarse ? new Coarse() : null;

From 181e51ef0e1421031187231c8b131aca9e3570cc Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sun, 8 Jun 2025 20:26:20 +0200
Subject: [PATCH 33/52] adjustable envelope curves

---
 packages/supradough/dough.mjs | 38 +++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index e16d11f8a..1b1be3e1d 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -214,7 +214,7 @@ export class ADSR {
     this.state = 'off'
     this.startTime = 0;
     this.startVal = 0;
-    this.curve = props.curve ?? 1;
+    this.decayCurve = props.decayCurve ?? 1;
   }
 
   update(curTime, gate, attack, decay, susVal, release) {
@@ -234,11 +234,11 @@ export class ADSR {
           this.startTime = curTime;
           return 1;
         }
-        return lerp(time / attack, this.startVal, 1, this.curve);
+        return lerp(time / attack, this.startVal, 1, 1);
       }
       case 'decay': {
         let time = curTime - this.startTime;
-        let curVal = lerp(time / decay, 1, susVal, -this.curve);
+        let curVal = lerp(time / decay, 1, susVal, -this.decayCurve);
         if (gate <= 0) {
           this.state = 'release';
           this.startTime = curTime;
@@ -267,7 +267,7 @@ export class ADSR {
           this.state = 'off';
           return 0;
         }
-        let curVal = lerp(time / release, this.startVal, 0, -this.curve);
+        let curVal = lerp(time / release, this.startVal, 0, -this.decayCurve);
         if (gate > 0) {
           this.state = 'attack';
           this.startTime = curTime;
@@ -599,7 +599,7 @@ export class DoughVoice {
     }
 
     if (this.penv) {
-      this._penv = new ADSR();
+      this._penv = new ADSR({ decayCurve: 4 });
       [this.pattack, this.pdecay, this.psustain, this.prelease] = getADSRValues([
         this.pattack,
         this.pdecay,
@@ -612,14 +612,14 @@ export class DoughVoice {
       this._fm = new SineOsc();
       this.fmh = this.fmh ?? getDefaultValue('fmh');
       if (this.fmenv) {
-        this._fmenv = new ADSR();
+        this._fmenv = new ADSR({ decayCurve: 2 });
         [this.fmattack, this.fmdecay, this.fmsustain, this.fmrelease] = getADSRValues([
           this.fmattack,
           this.fmdecay,
           this.fmsustain,
           this.fmrelease,
         ]);
-      
+
       }
     }
 
@@ -628,8 +628,8 @@ export class DoughVoice {
     this.resonance = this.resonance ?? getDefaultValue('resonance');
     if (this.lpenv) {
 
-      this._lpenv = new ADSR({curve: 4});
-    
+      this._lpenv = new ADSR({ decayCurve: 4 });
+
       [this.lpattack, this.lpdecay, this.lpsustain, this.lprelease] = getADSRValues([
         this.lpattack,
         this.lpdecay,
@@ -641,8 +641,8 @@ export class DoughVoice {
     this._hpf = this.hcutoff ? new TwoPoleFilter() : null;
     this.hresonance = this.hresonance ?? getDefaultValue('hresonance');
     if (this.hpenv) {
-      this._hpenv = new ADSR();
-    
+      this._hpenv = new ADSR({ decayCurve: 4 });
+
       [this.hpattack, this.hpdecay, this.hpsustain, this.hprelease] = getADSRValues([
         this.hpattack,
         this.hpdecay,
@@ -653,7 +653,7 @@ export class DoughVoice {
     this._bpf = this.bandf ? new TwoPoleFilter() : null;
     this.bandq = this.bandq ?? getDefaultValue('bandq');
     if (this.bpenv) {
-      this._bpenv = new ADSR();
+      this._bpenv = new ADSR({ decayCurve: 4 });
       [this.bpattack, this.bpdecay, this.bpsustain, this.bprelease] = getADSRValues([
         this.bpattack,
         this.bpdecay,
@@ -663,7 +663,7 @@ export class DoughVoice {
     }
 
     // gain envelope
-    this._adsr = new ADSR({curve: 2});
+    this._adsr = new ADSR({ decayCurve: 2 });
 
     // fx setup
     this._coarse = this.coarse ? new Coarse() : null;
@@ -695,7 +695,7 @@ export class DoughVoice {
     if (this._fm) {
       let fmi = this.fmi;
       if (this._fmenv) {
-        const env = this._fmenv.update(t, gate, this.fmattack, this.fmdecay, this.fmsustain, this.fmrelease) ** 2;
+        const env = this._fmenv.update(t, gate, this.fmattack, this.fmdecay, this.fmsustain, this.fmrelease);
         fmi = this.fmenv * env * fmi;
       }
       const modfreq = freq * this.fmh;
@@ -704,7 +704,7 @@ export class DoughVoice {
     }
 
     if (this._penv) {
-      const env = this._penv.update(t, gate, this.pattack, this.pdecay, this.psustain, this.prelease) ** 2;
+      const env = this._penv.update(t, gate, this.pattack, this.pdecay, this.psustain, this.prelease);
       freq = freq + env * this.penv;
     }
 
@@ -722,8 +722,8 @@ export class DoughVoice {
     if (this._lpf) {
       let cutoff = this.cutoff;
       if (this._lpenv) {
-        const env = this._lpenv.update(t, gate, this.lpattack, this.lpdecay, this.lpsustain, this.lprelease) ** 2;
-        cutoff = 2 ** this.lpenv * env * cutoff + cutoff;
+        const env = this._lpenv.update(t, gate, this.lpattack, this.lpdecay, this.lpsustain, this.lprelease);
+        cutoff = this.lpenv * env * cutoff + cutoff;
       }
       cutoff = this.freq2cutoff(cutoff);
       this._lpf.update(s, cutoff, this.resonance);
@@ -733,7 +733,7 @@ export class DoughVoice {
     if (this._hpf) {
       let cutoff = this.hcutoff;
       if (this._hpenv) {
-        const env = this._hpenv.update(t, gate, this.hpattack, this.hpdecay, this.hpsustain, this.hprelease) ** 2;
+        const env = this._hpenv.update(t, gate, this.hpattack, this.hpdecay, this.hpsustain, this.hprelease);
         cutoff = 2 ** this.hpenv * env * cutoff + cutoff;
       }
       cutoff = this.freq2cutoff(cutoff);
@@ -744,7 +744,7 @@ export class DoughVoice {
     if (this._bpf) {
       let cutoff = this.bandf;
       if (this._bpenv) {
-        const env = this._bpenv.update(t, gate, this.bpattack, this.bpdecay, this.bpsustain, this.bprelease) ** 2;
+        const env = this._bpenv.update(t, gate, this.bpattack, this.bpdecay, this.bpsustain, this.bprelease);
         cutoff = 2 ** this.bpenv * env * cutoff + cutoff;
       }
       cutoff = this.freq2cutoff(cutoff);

From 73ef43dd2c85db8493c7a0d41fda2ec0cd824f58 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sun, 8 Jun 2025 22:56:55 +0200
Subject: [PATCH 34/52] move things around in init + shorten things

---
 packages/supradough/dough.mjs | 226 ++++++++++++----------------------
 1 file changed, 79 insertions(+), 147 deletions(-)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 1b1be3e1d..f0665b779 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -211,7 +211,7 @@ function lerp(x, y0, y1, exponent = 1) {
 
 export class ADSR {
   constructor(props = {}) {
-    this.state = 'off'
+    this.state = 'off';
     this.startTime = 0;
     this.startVal = 0;
     this.decayCurve = props.decayCurve ?? 1;
@@ -398,7 +398,7 @@ export class Distort {
 // distortion could be expressed as a function, because it's stateless
 
 export class BufferPlayer {
-  static samples = new Map();
+  static samples = new Map(); // string -> { channels, sampleRate }
   buffer; // { channels: Float32Array, sampleRate: number }
   pos = 0;
   sampleFreq = 261.626; // middle c
@@ -421,7 +421,7 @@ export function _rangex(sig, min, max) {
 }
 
 // duplicate
-export const getADSRValues = (params, curve = 'linear', defaultValues) => {
+export const getADSR = (params, curve = 'linear', defaultValues) => {
   const envmin = curve === 'exponential' ? 0.001 : 0.001;
   const releaseMin = 0.01;
   const envmax = 1;
@@ -517,167 +517,99 @@ export class DoughVoice {
   l = 0;
   r = 0;
   constructor(value) {
-    // params without defaults:
-    /*
-    bank,
-    source,
-    cutoff,
-    lpenv,
-    lpattack,
-    lpdecay,
-    lpsustain,
-    lprelease,
-    hpenv,
-    hcutoff,
-    hpattack,
-    hpdecay,
-    hpsustain,
-    hprelease,
-    bpenv,
-    bandf,
-    bpattack,
-    bpdecay,
-    bpsustain,
-    bprelease,
-    phaserrate,
-    phasersweep,
-    phasercenter,
-    shape,
-    vowel,
-    room,
-    roomfade,
-    roomlp,
-    roomdim,
-    roomsize,
-    ir,
-    analyze,
-    fmh,
-    fmi
-    */
     value.freq = getFrequency(value);
-    Object.assign(this, value);
-    // params with defaults:
-    this.s = this.s ?? getDefaultValue('s');
-    this.gain = this.gain ?? getDefaultValue('gain');
-    this.velocity = this.velocity ?? getDefaultValue('velocity');
-    this.postgain = this.postgain ?? getDefaultValue('postgain');
-    this.density = this.density ?? getDefaultValue('density');
-    this.fanchor = this.fanchor ?? getDefaultValue('fanchor');
-    this.drive = this.drive ?? 0.69;
-    this.phaserdepth = this.phaserdepth ?? getDefaultValue('phaserdepth');
-    this.shapevol = this.shapevol ?? getDefaultValue('shapevol');
-    this.distortvol = this.distortvol ?? getDefaultValue('distortvol');
-    this.i = this.i ?? getDefaultValue('i');
-    this.fft = this.fft ?? getDefaultValue('fft');
-    this.pan = this.pan ?? getDefaultValue('pan');
-    this.orbit = this.orbit ?? getDefaultValue('orbit');
-    this.fmenv = this.fmenv ?? getDefaultValue('fmenv');
+    let $ = this;
+    Object.assign($, value);
+    $.s = $.s ?? getDefaultValue('s');
+    $.gain = $.gain ?? getDefaultValue('gain');
+    $.velocity = $.velocity ?? getDefaultValue('velocity');
+    $.postgain = $.postgain ?? getDefaultValue('postgain');
+    $.density = $.density ?? getDefaultValue('density');
+    $.fanchor = $.fanchor ?? getDefaultValue('fanchor');
+    $.drive = $.drive ?? 0.69;
+    $.phaserdepth = $.phaserdepth ?? getDefaultValue('phaserdepth');
+    $.shapevol = $.shapevol ?? getDefaultValue('shapevol');
+    $.distortvol = $.distortvol ?? getDefaultValue('distortvol');
+    $.i = $.i ?? getDefaultValue('i');
+    $.fft = $.fft ?? getDefaultValue('fft');
+    $.pan = $.pan ?? getDefaultValue('pan');
+    $.orbit = $.orbit ?? getDefaultValue('orbit');
+    $.fmenv = $.fmenv ?? getDefaultValue('fmenv');
+    $.resonance = $.resonance ?? getDefaultValue('resonance');
+    $.hresonance = $.hresonance ?? getDefaultValue('hresonance');
+    $.bandq = $.bandq ?? getDefaultValue('bandq');
 
-    [this.attack, this.decay, this.sustain, this.release] = getADSRValues([
-      this.attack,
-      this.decay,
-      this.sustain,
-      this.release,
-    ]);
+    [$.attack, $.decay, $.sustain, $.release] = getADSR([$.attack, $.decay, $.sustain, $.release]);
 
-    this._holdEnd = this._begin + this._duration; // needed for gate
-    this._end = this._holdEnd + this.release + 0.01; // needed for despawn
+    $._holdEnd = $._begin + $._duration; // needed for gate
+    $._end = $._holdEnd + $.release + 0.01; // needed for despawn
 
-    this.s ??= 'triangle';
-    if (this.s === 'saw' || this.s === 'sawtooth') {
-      this.s = 'zaw'; // polyblepped saw when fm is applied
+    $.s ??= 'triangle';
+    if ($.s === 'saw' || $.s === 'sawtooth') {
+      $.s = 'zaw'; // polyblepped saw when fm is applied
     }
-    if (shapes[this.s]) {
-      const SourceClass = shapes[this.s];
-      this._sound = new SourceClass();
-    } else if (BufferPlayer.samples.has(this.s)) {
-      this._sample = new BufferPlayer();
-      const buffer = BufferPlayer.samples.get(this.s);
-      this._sample.buffer = buffer;
+
+    if (shapes[$.s]) {
+      const SourceClass = shapes[$.s];
+      $._sound = new SourceClass();
+      $._channels = 1;
+    } else if (BufferPlayer.samples.has($.s)) {
+      $._sample = new BufferPlayer();
+      const buffer = BufferPlayer.samples.get($.s);
+      $._sample.buffer = buffer; // {channels,sampleRate}
+      $._channels = $._sample.buffer.channels.length;
     } else {
-      console.warn('sound not found', this.s);
+      console.warn('sound not found', $.s);
     }
 
-    if (this.penv) {
-      this._penv = new ADSR({ decayCurve: 4 });
-      [this.pattack, this.pdecay, this.psustain, this.prelease] = getADSRValues([
-        this.pattack,
-        this.pdecay,
-        this.psustain,
-        this.prelease,
-      ]);
+    if ($.penv) {
+      $._penv = new ADSR({ decayCurve: 4 });
+      [$.pattack, $.pdecay, $.psustain, $.prelease] = getADSR([$.pattack, $.pdecay, $.psustain, $.prelease]);
     }
 
-    if (this.fmi) {
-      this._fm = new SineOsc();
-      this.fmh = this.fmh ?? getDefaultValue('fmh');
-      if (this.fmenv) {
-        this._fmenv = new ADSR({ decayCurve: 2 });
-        [this.fmattack, this.fmdecay, this.fmsustain, this.fmrelease] = getADSRValues([
-          this.fmattack,
-          this.fmdecay,
-          this.fmsustain,
-          this.fmrelease,
-        ]);
-
+    if ($.fmi) {
+      $._fm = new SineOsc();
+      $.fmh = $.fmh ?? getDefaultValue('fmh');
+      if ($.fmenv) {
+        $._fmenv = new ADSR({ decayCurve: 2 });
+        [$.fmattack, $.fmdecay, $.fmsustain, $.fmrelease] = getADSR([$.fmattack, $.fmdecay, $.fmsustain, $.fmrelease]);
       }
     }
 
-    // filter setup
-    this._lpf = this.cutoff ? new TwoPoleFilter() : null;
-    this.resonance = this.resonance ?? getDefaultValue('resonance');
-    if (this.lpenv) {
-
-      this._lpenv = new ADSR({ decayCurve: 4 });
-
-      [this.lpattack, this.lpdecay, this.lpsustain, this.lprelease] = getADSRValues([
-        this.lpattack,
-        this.lpdecay,
-        this.lpsustain,
-        this.lprelease,
-      ]);
-    }
-
-    this._hpf = this.hcutoff ? new TwoPoleFilter() : null;
-    this.hresonance = this.hresonance ?? getDefaultValue('hresonance');
-    if (this.hpenv) {
-      this._hpenv = new ADSR({ decayCurve: 4 });
-
-      [this.hpattack, this.hpdecay, this.hpsustain, this.hprelease] = getADSRValues([
-        this.hpattack,
-        this.hpdecay,
-        this.hpsustain,
-        this.hprelease,
-      ]);
-    }
-    this._bpf = this.bandf ? new TwoPoleFilter() : null;
-    this.bandq = this.bandq ?? getDefaultValue('bandq');
-    if (this.bpenv) {
-      this._bpenv = new ADSR({ decayCurve: 4 });
-      [this.bpattack, this.bpdecay, this.bpsustain, this.bprelease] = getADSRValues([
-        this.bpattack,
-        this.bpdecay,
-        this.bpsustain,
-        this.bprelease,
-      ]);
-    }
-
     // gain envelope
-    this._adsr = new ADSR({ decayCurve: 2 });
-
-    // fx setup
-    this._coarse = this.coarse ? new Coarse() : null;
-    this._crush = this.crush ? new Crush() : null;
-    this._distort = this.distort ? new Distort() : null;
-
+    $._adsr = new ADSR({ decayCurve: 2 });
     // delay
-    this.delay = this.delay ?? getDefaultValue('delay');
-    this.delayfeedback = this.delayfeedback ?? getDefaultValue('delayfeedback');
-    this.delaytime = this.delaytime ?? getDefaultValue('delaytime');
+    $.delay = $.delay ?? getDefaultValue('delay');
+    $.delayfeedback = $.delayfeedback ?? getDefaultValue('delayfeedback');
+    $.delaytime = $.delaytime ?? getDefaultValue('delaytime');
 
     // precalculated values
-    this.piOverSr = Math.PI / value.sampleRate;
-    this.eighthOverLogHalf = 0.125 / Math.log(0.5);
+    $.piOverSr = Math.PI / value.sampleRate;
+    $.eighthOverLogHalf = 0.125 / Math.log(0.5);
+
+    // filter setup
+    if ($.lpenv) {
+      $._lpenv = new ADSR({ decayCurve: 4 });
+      [$.lpattack, $.lpdecay, $.lpsustain, $.lprelease] = getADSR([$.lpattack, $.lpdecay, $.lpsustain, $.lprelease]);
+    }
+    if ($.hpenv) {
+      $._hpenv = new ADSR({ decayCurve: 4 });
+      [$.hpattack, $.hpdecay, $.hpsustain, $.hprelease] = getADSR([$.hpattack, $.hpdecay, $.hpsustain, $.hprelease]);
+    }
+    if ($.bpenv) {
+      $._bpenv = new ADSR({ decayCurve: 4 });
+      [$.bpattack, $.bpdecay, $.bpsustain, $.bprelease] = getADSR([$.bpattack, $.bpdecay, $.bpsustain, $.bprelease]);
+    }
+
+    // 1 per channel::
+    $._lpf = $.cutoff ? new TwoPoleFilter() : null;
+    $._hpf = $.hcutoff ? new TwoPoleFilter() : null;
+    $._bpf = $.bandf ? new TwoPoleFilter() : null;
+
+    // fx setup
+    $._coarse = $.coarse ? new Coarse() : null;
+    $._crush = $.crush ? new Crush() : null;
+    $._distort = $.distort ? new Distort() : null;
   }
   // credits to pulu: https://github.com/felixroos/kabelsalat/issues/35
   freq2cutoff(freq) {

From 1081fc69e9130bed6c28a516d8a17d6003be7e13 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Mon, 9 Jun 2025 09:52:29 +0200
Subject: [PATCH 35/52] refactor: stereo sample support + channelwise fx

---
 packages/supradough/dough-worklet.mjs |   2 +-
 packages/supradough/dough.mjs         | 176 +++++++++++++++-----------
 2 files changed, 101 insertions(+), 77 deletions(-)

diff --git a/packages/supradough/dough-worklet.mjs b/packages/supradough/dough-worklet.mjs
index dd2315628..18c316b2d 100644
--- a/packages/supradough/dough-worklet.mjs
+++ b/packages/supradough/dough-worklet.mjs
@@ -29,7 +29,7 @@ class DoughProcessor extends AudioWorkletProcessor {
       this.dough.update();
       for (let c = 0; c < output.length; c++) {
         //prevent speaker blowout via clipping if threshold exceeds
-        output[c][i] = clamp(this.dough.channels[c], -1, 1);
+        output[c][i] = clamp(this.dough.out[c], -1, 1);
       }
     }
     return true; // keep the audio processing going
diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index f0665b779..963bd9bdc 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -399,15 +399,20 @@ export class Distort {
 
 export class BufferPlayer {
   static samples = new Map(); // string -> { channels, sampleRate }
-  buffer; // { channels: Float32Array, sampleRate: number }
+  buffer; // Float32Array
+  sampleRate;
   pos = 0;
   sampleFreq = 261.626; // middle c
-  update(freq, channel = 0) {
-    if (this.pos >= this.buffer.channels[channel].length) {
+  constructor(buffer, sampleRate) {
+    this.buffer = buffer;
+    this.sampleRate = sampleRate;
+  }
+  update(freq) {
+    if (this.pos >= this.buffer.length) {
       return 0;
     }
-    const speed = ((freq / this.sampleFreq) * this.buffer.sampleRate) / SAMPLE_RATE;
-    let s = this.buffer.channels[channel][Math.floor(this.pos)];
+    const speed = ((freq / this.sampleFreq) * this.sampleRate) / SAMPLE_RATE;
+    let s = this.buffer[Math.floor(this.pos)];
     this.pos = this.pos + speed;
     return s;
   }
@@ -514,8 +519,7 @@ const getFrequency = (value) => {
 };
 
 export class DoughVoice {
-  l = 0;
-  r = 0;
+  out = [0, 0];
   constructor(value) {
     value.freq = getFrequency(value);
     let $ = this;
@@ -554,10 +558,12 @@ export class DoughVoice {
       $._sound = new SourceClass();
       $._channels = 1;
     } else if (BufferPlayer.samples.has($.s)) {
-      $._sample = new BufferPlayer();
-      const buffer = BufferPlayer.samples.get($.s);
-      $._sample.buffer = buffer; // {channels,sampleRate}
-      $._channels = $._sample.buffer.channels.length;
+      const sample = BufferPlayer.samples.get($.s);
+      $._buffers = [];
+      $._channels = sample.channels.length;
+      for (let i = 0; i < $._channels; i++) {
+        $._buffers.push(new BufferPlayer(sample.channels[i], sample.sampleRate));
+      }
     } else {
       console.warn('sound not found', $.s);
     }
@@ -601,15 +607,21 @@ export class DoughVoice {
       [$.bpattack, $.bpdecay, $.bpsustain, $.bprelease] = getADSR([$.bpattack, $.bpdecay, $.bpsustain, $.bprelease]);
     }
 
-    // 1 per channel::
-    $._lpf = $.cutoff ? new TwoPoleFilter() : null;
-    $._hpf = $.hcutoff ? new TwoPoleFilter() : null;
-    $._bpf = $.bandf ? new TwoPoleFilter() : null;
-
-    // fx setup
-    $._coarse = $.coarse ? new Coarse() : null;
-    $._crush = $.crush ? new Crush() : null;
-    $._distort = $.distort ? new Distort() : null;
+    // channelwise effects setup
+    $._lpf = $.cutoff ? [] : null;
+    $._hpf = $.hcutoff ? [] : null;
+    $._bpf = $.bandf ? [] : null;
+    $._coarse = $.coarse ? [] : null;
+    $._crush = $.crush ? [] : null;
+    $._distort = $.distort ? [] : null;
+    for (let i = 0; i < this._channels; i++) {
+      $._lpf?.push(new TwoPoleFilter());
+      $._hpf?.push(new TwoPoleFilter());
+      $._bpf?.push(new TwoPoleFilter());
+      $._coarse?.push(new Coarse());
+      $._crush?.push(new Crush());
+      $._distort?.push(new Distort());
+    }
   }
   // credits to pulu: https://github.com/felixroos/kabelsalat/issues/35
   freq2cutoff(freq) {
@@ -617,13 +629,13 @@ export class DoughVoice {
     return 1 - Math.log(c) * this.eighthOverLogHalf;
   }
   update(t) {
-    if (!this._sound && !this._sample) {
+    if (!this._sound && !this._buffers) {
       return 0;
     }
-    let s = 0;
     let gate = Number(t >= this._begin && t <= this._holdEnd);
 
     let freq = this.freq;
+    // frequency modulation
     if (this._fm) {
       let fmi = this.fmi;
       if (this._fmenv) {
@@ -635,74 +647,86 @@ export class DoughVoice {
       freq = freq + this._fm.update(modfreq) * modgain;
     }
 
+    // pitch envelope
     if (this._penv) {
       const env = this._penv.update(t, gate, this.pattack, this.pdecay, this.psustain, this.prelease);
       freq = freq + env * this.penv;
     }
 
-    // sound source
-    if (this._sound && this.s === 'pulse') {
-      s = this._sound.update(freq, this.pw ?? 0.5);
-    } else if (this._sound) {
-      s = this._sound.update(freq);
-    } else if (this._sample) {
-      s = this._sample.update(freq, 0); // tbd: stereo samples...
-    }
-    s = s * this.gain * this.velocity;
-
-    // lpf
+    // filters
+    let lpf = this.cutoff;
     if (this._lpf) {
-      let cutoff = this.cutoff;
       if (this._lpenv) {
         const env = this._lpenv.update(t, gate, this.lpattack, this.lpdecay, this.lpsustain, this.lprelease);
-        cutoff = this.lpenv * env * cutoff + cutoff;
+        lpf = this.lpenv * env * lpf + lpf;
       }
-      cutoff = this.freq2cutoff(cutoff);
-      this._lpf.update(s, cutoff, this.resonance);
-      s = this._lpf.s1;
+      lpf = this.freq2cutoff(lpf);
     }
-    // hpf
+    let hpf = this.hcutoff;
     if (this._hpf) {
-      let cutoff = this.hcutoff;
       if (this._hpenv) {
         const env = this._hpenv.update(t, gate, this.hpattack, this.hpdecay, this.hpsustain, this.hprelease);
-        cutoff = 2 ** this.hpenv * env * cutoff + cutoff;
+        hpf = 2 ** this.hpenv * env * hpf + hpf;
       }
-      cutoff = this.freq2cutoff(cutoff);
-      this._hpf.update(s, cutoff, this.hresonance);
-      s = s - this._hpf.s1;
+      hpf = this.freq2cutoff(hpf);
     }
-    // bpf
+    let bpf = this.bandf;
     if (this._bpf) {
-      let cutoff = this.bandf;
       if (this._bpenv) {
         const env = this._bpenv.update(t, gate, this.bpattack, this.bpdecay, this.bpsustain, this.bprelease);
-        cutoff = 2 ** this.bpenv * env * cutoff + cutoff;
+        bpf = 2 ** this.bpenv * env * bpf + bpf;
       }
-      cutoff = this.freq2cutoff(cutoff);
-      this._bpf.update(s, cutoff, this.bandq);
-      s = this._bpf.s0;
+      bpf = this.freq2cutoff(bpf);
     }
-
-    this._coarse && (s = this._coarse.update(s, this.coarse));
-    this._crush && (s = this._crush.update(s, this.crush));
-    this._distort && (s = this._distort.update(s, this.distort, this.distortvol));
-
+    // gain envelope
     const env = this._adsr.update(t, gate, this.attack, this.decay, this.sustain, this.release);
-    s = s * env;
 
-    s = s * this.postgain;
-    if (!this._sample) {
-      s = s * 0.2; // turn down waveforms
+    // channelwise dsp
+    for (let i = 0; i < this._channels; i++) {
+      // sound source
+      if (this._sound && this.s === 'pulse') {
+        this.out[i] = this._sound.update(freq, this.pw ?? 0.5);
+      } else if (this._sound) {
+        this.out[i] = this._sound.update(freq);
+      } else if (this._buffers) {
+        this.out[i] = this._buffers[i].update(freq);
+      }
+      this.out[i] = this.out[i] * this.gain * this.velocity;
+
+      if (this._lpf) {
+        this._lpf[i].update(this.out[i], lpf, this.resonance);
+        this.out[i] = this._lpf[i].s1;
+      }
+      if (this._hpf) {
+        this._hpf[i].update(this.out[i], hcutoff, this.hresonance);
+        this.out[i] = this.out[i] - this._hpf[i].s1;
+      }
+      if (this._bpf) {
+        this._bpf[i].update(this.out[i], bpf, this.bandq);
+        this.out[i] = this._bpf[i].s0;
+      }
+      if (this._coarse) {
+        this.out[i] = this._coarse[i].update(this.out[i], this.coarse);
+      }
+      if (this._crush) {
+        this.out[i] = this._crush[i].update(this.out[i], this.crush);
+      }
+      if (this._distort) {
+        this.out[i] = this._distort[i].update(this.out[i], this.distort, this.distortvol);
+      }
+      this.out[i] = this.out[i] * env;
+      this.out[i] = this.out[i] * this.postgain;
+      if (!this._buffers) {
+        this.out[i] = this.out[i] * 0.2; // turn down waveform
+      }
     }
-
-    if (this.pan === 0.5) {
-      this.l = this.r = s; // mono
-    } else {
-      // stereo
-      const pos = (this.pan * Math.PI) / 2;
-      this.l = s * Math.cos(pos);
-      this.r = s * Math.sin(pos);
+    if (this._channels === 1) {
+      this.out[1] = this.out[0];
+    }
+    if (this.pan !== 0.5) {
+      const panpos = (this.pan * Math.PI) / 2;
+      this.out[0] = this.out[0] * Math.cos(panpos);
+      this.out[1] = this.out[1] * Math.sin(panpos);
     }
   }
 }
@@ -713,7 +737,7 @@ export class Dough {
   voices = []; // DoughVoice[]
   vid = 0;
   q = [];
-  channels = [0, 0];
+  out = [0, 0];
   delaysend = [0, 0];
   delaytime = getDefaultValue('delaytime');
   delayfeedback = getDefaultValue('delayfeedback');
@@ -782,15 +806,15 @@ export class Dough {
       this.q.shift();
     }
     // add active voices
-    this.channels[0] = 0;
-    this.channels[1] = 0;
+    this.out[0] = 0;
+    this.out[1] = 0;
     for (let v = 0; v < this.voices.length; v++) {
       this.voices[v].update(this.t / this.sampleRate);
-      this.channels[0] += this.voices[v].l;
-      this.channels[1] += this.voices[v].r;
+      this.out[0] += this.voices[v].out[0];
+      this.out[1] += this.voices[v].out[1];
       if (this.voices[v].delay) {
-        this.delaysend[0] += this.voices[v].l * this.voices[v].delay;
-        this.delaysend[1] += this.voices[v].r * this.voices[v].delay;
+        this.delaysend[0] += this.voices[v].out[0] * this.voices[v].delay;
+        this.delaysend[1] += this.voices[v].out[1] * this.voices[v].delay;
         this.delaytime = this.voices[v].delaytime; // we trust that these are initialized in the voice
         this.delayfeedback = this.voices[v].delayfeedback;
       }
@@ -800,8 +824,8 @@ export class Dough {
     const delayR = this._delayR.update(this.delaysend[1], this.delaytime);
     this.delaysend[0] = delayL * this.delayfeedback;
     this.delaysend[1] = delayR * this.delayfeedback;
-    this.channels[0] += delayL;
-    this.channels[1] += delayR;
+    this.out[0] += delayL;
+    this.out[1] += delayR;
     this.t++;
   }
 }

From d1b6b6be8541b833410f147672aa68071dda3f5f Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Mon, 9 Jun 2025 09:54:24 +0200
Subject: [PATCH 36/52] fix: hpf

---
 packages/supradough/dough.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 963bd9bdc..975840cb3 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -698,7 +698,7 @@ export class DoughVoice {
         this.out[i] = this._lpf[i].s1;
       }
       if (this._hpf) {
-        this._hpf[i].update(this.out[i], hcutoff, this.hresonance);
+        this._hpf[i].update(this.out[i], hpf, this.hresonance);
         this.out[i] = this.out[i] - this._hpf[i].s1;
       }
       if (this._bpf) {

From 3ac0fdf619d824757aa9f2f6b0da8366b7b42463 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Mon, 9 Jun 2025 11:07:57 +0200
Subject: [PATCH 37/52] rudimentary sample map loading (doughsamples)

---
 packages/superdough/sampler.mjs  |  91 ++++++++--------
 packages/supradough/dough.mjs    |  19 ++--
 packages/webaudio/supradough.mjs | 178 ++++++++++++-------------------
 3 files changed, 126 insertions(+), 162 deletions(-)

diff --git a/packages/superdough/sampler.mjs b/packages/superdough/sampler.mjs
index 18d1b7797..9188c17c3 100644
--- a/packages/superdough/sampler.mjs
+++ b/packages/superdough/sampler.mjs
@@ -196,6 +196,52 @@ function getSamplesPrefixHandler(url) {
   return;
 }
 
+export async function fetchSampleMap(url) {
+  // check if custom prefix handler
+  const handler = getSamplesPrefixHandler(url);
+  if (handler) {
+    return handler(url);
+  }
+  url = resolveSpecialPaths(url);
+  if (url.startsWith('github:')) {
+    url = githubPath(url, 'strudel.json');
+  }
+  if (url.startsWith('local:')) {
+    url = `http://localhost:5432`;
+  }
+  if (url.startsWith('shabda:')) {
+    let [_, path] = url.split('shabda:');
+    url = `https://shabda.ndre.gr/${path}.json?strudel=1`;
+  }
+  if (url.startsWith('shabda/speech')) {
+    let [_, path] = url.split('shabda/speech');
+    path = path.startsWith('/') ? path.substring(1) : path;
+    let [params, words] = path.split(':');
+    let gender = 'f';
+    let language = 'en-GB';
+    if (params) {
+      [language, gender] = params.split('/');
+    }
+    url = `https://shabda.ndre.gr/speech/${words}.json?gender=${gender}&language=${language}&strudel=1'`;
+  }
+  if (typeof fetch !== 'function') {
+    // not a browser
+    return;
+  }
+  const base = url.split('/').slice(0, -1).join('/');
+  if (typeof fetch === 'undefined') {
+    // skip fetch when in node / testing
+    return;
+  }
+  const json = await fetch(url)
+    .then((res) => res.json())
+    .catch((error) => {
+      console.error(error);
+      throw new Error(`error loading "${url}"`);
+    });
+  return [json, json._base || base];
+}
+
 /**
  * Loads a collection of samples to use with `s`
  * @example
@@ -217,49 +263,8 @@ function getSamplesPrefixHandler(url) {
 
 export const samples = async (sampleMap, baseUrl = sampleMap._base || '', options = {}) => {
   if (typeof sampleMap === 'string') {
-    // check if custom prefix handler
-    const handler = getSamplesPrefixHandler(sampleMap);
-    if (handler) {
-      return handler(sampleMap);
-    }
-    sampleMap = resolveSpecialPaths(sampleMap);
-    if (sampleMap.startsWith('github:')) {
-      sampleMap = githubPath(sampleMap, 'strudel.json');
-    }
-    if (sampleMap.startsWith('local:')) {
-      sampleMap = `http://localhost:5432`;
-    }
-    if (sampleMap.startsWith('shabda:')) {
-      let [_, path] = sampleMap.split('shabda:');
-      sampleMap = `https://shabda.ndre.gr/${path}.json?strudel=1`;
-    }
-    if (sampleMap.startsWith('shabda/speech')) {
-      let [_, path] = sampleMap.split('shabda/speech');
-      path = path.startsWith('/') ? path.substring(1) : path;
-      let [params, words] = path.split(':');
-      let gender = 'f';
-      let language = 'en-GB';
-      if (params) {
-        [language, gender] = params.split('/');
-      }
-      sampleMap = `https://shabda.ndre.gr/speech/${words}.json?gender=${gender}&language=${language}&strudel=1'`;
-    }
-    if (typeof fetch !== 'function') {
-      // not a browser
-      return;
-    }
-    const base = sampleMap.split('/').slice(0, -1).join('/');
-    if (typeof fetch === 'undefined') {
-      // skip fetch when in node / testing
-      return;
-    }
-    return fetch(sampleMap)
-      .then((res) => res.json())
-      .then((json) => samples(json, baseUrl || json._base || base, options))
-      .catch((error) => {
-        console.error(error);
-        throw new Error(`error loading "${sampleMap}"`);
-      });
+    const [json, base] = await fetchSampleMap(sampleMap);
+    return samples(json, baseUrl || base, options);
   }
   const { prebake, tag } = options;
   processSampleMap(
diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 975840cb3..207638737 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -402,7 +402,7 @@ export class BufferPlayer {
   buffer; // Float32Array
   sampleRate;
   pos = 0;
-  sampleFreq = 261.626; // middle c
+  sampleFreq = note2freq();
   constructor(buffer, sampleRate) {
     this.buffer = buffer;
     this.sampleRate = sampleRate;
@@ -411,7 +411,7 @@ export class BufferPlayer {
     if (this.pos >= this.buffer.length) {
       return 0;
     }
-    const speed = ((freq / this.sampleFreq) * this.sampleRate) / SAMPLE_RATE;
+    const speed = ((freq / this.sampleFreq) * SAMPLE_RATE) / this.sampleRate;
     let s = this.buffer[Math.floor(this.pos)];
     this.pos = this.pos + speed;
     return s;
@@ -458,6 +458,7 @@ let shapes = {
 };
 
 const defaultDefaultValues = {
+  note: 48,
   s: 'triangle',
   gain: 1,
   postgain: 1,
@@ -505,23 +506,19 @@ const note2midi = (note, defaultOctave = 3) => {
   oct = Number(oct || defaultOctave);
   return (oct + 1) * 12 + chroma + offset;
 };
-const getFrequency = (value) => {
-  let { note, freq } = value;
-  note = note || 36;
+const midi2freq = (midi) => Math.pow(2, (midi - 69) / 12) * 440;
+const note2freq = (note) => {
+  note = note || getDefaultValue('note');
   if (typeof note === 'string') {
     note = note2midi(note, 3); // e.g. c3 => 48
   }
-  if (!freq && typeof note === 'number') {
-    freq = Math.pow(2, (note - 69) / 12) * 440;
-  }
-
-  return Number(freq);
+  return midi2freq(note);
 };
 
 export class DoughVoice {
   out = [0, 0];
   constructor(value) {
-    value.freq = getFrequency(value);
+    value.freq ??= note2freq(value.note);
     let $ = this;
     Object.assign($, value);
     $.s = $.s ?? getDefaultValue('s');
diff --git a/packages/webaudio/supradough.mjs b/packages/webaudio/supradough.mjs
index 269dcda95..3b45415df 100644
--- a/packages/webaudio/supradough.mjs
+++ b/packages/webaudio/supradough.mjs
@@ -25,105 +25,58 @@ Pattern.prototype.supradough = function () {
   }, 1);
 };
 
-let samples = {
-  casio: [
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/casio/high.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/casio/low.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/casio/noise.wav',
-  ],
-  crow: [
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/crow/000_crow.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/crow/001_crow2.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/crow/002_crow3.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/crow/003_crow4.wav',
-  ],
-  insect: [
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/insect/000_everglades_conehead.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/insect/001_robust_shieldback.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/insect/002_seashore_meadow_katydid.wav',
-  ],
-  wind: [
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/000_wind1.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/001_wind10.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/002_wind2.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/003_wind3.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/004_wind4.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/005_wind5.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/006_wind6.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/007_wind7.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/008_wind8.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/wind/009_wind9.wav',
-  ],
-  jazz: [
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/000_BD.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/001_CB.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/002_FX.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/003_HH.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/004_OH.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/005_P1.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/006_P2.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/jazz/007_SN.wav',
-  ],
-  metal: [
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/000_0.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/001_1.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/002_2.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/003_3.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/004_4.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/005_5.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/006_6.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/007_7.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/008_8.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/metal/009_9.wav',
-  ],
-  east: [
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/000_nipon_wood_block.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/001_ohkawa_mute.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/002_ohkawa_open.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/003_shime_hi.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/004_shime_hi_2.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/005_shime_mute.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/006_taiko_1.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/007_taiko_2.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/east/008_taiko_3.wav',
-  ],
-  space: [
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/000_0.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/001_1.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/002_11.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/003_12.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/004_13.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/005_14.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/006_15.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/007_16.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/008_17.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/009_18.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/010_2.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/011_3.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/012_4.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/013_5.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/014_6.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/015_7.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/016_8.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/space/017_9.wav',
-  ],
-  numbers: [
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/0.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/1.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/2.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/3.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/4.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/5.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/6.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/7.wav',
-    'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/numbers/8.wav',
-  ],
-  piano: ['https://raw.githubusercontent.com/felixroos/dough-samples/refs/heads/main/piano/C3v8.mp3'],
-  flute: ['https://raw.githubusercontent.com/felixroos/samples/refs/heads/main/flute/c4.mp3'],
-  bd: [
-    'https://raw.githubusercontent.com/geikha/tidal-drum-machines/15eac73c5e878550f91d864a4863e014799403f1/machines/RolandTR909/rolandtr909-bd/Bassdrum-01.wav',
-  ],
-};
+function githubPath(base, subpath = '') {
+  if (!base.startsWith('github:')) {
+    throw new Error('expected "github:" at the start of pseudoUrl');
+  }
+  let [_, path] = base.split('github:');
+  path = path.endsWith('/') ? path.slice(0, -1) : path;
+  if (path.split('/').length === 2) {
+    // assume main as default branch if none set
+    path += '/main';
+  }
+  return `https://raw.githubusercontent.com/${path}/${subpath}`;
+}
+export async function fetchSampleMap(url) {
+  if (url.startsWith('github:')) {
+    url = githubPath(url, 'strudel.json');
+  }
+  if (url.startsWith('local:')) {
+    url = `http://localhost:5432`;
+  }
+  if (url.startsWith('shabda:')) {
+    let [_, path] = url.split('shabda:');
+    url = `https://shabda.ndre.gr/${path}.json?strudel=1`;
+  }
+  if (url.startsWith('shabda/speech')) {
+    let [_, path] = url.split('shabda/speech');
+    path = path.startsWith('/') ? path.substring(1) : path;
+    let [params, words] = path.split(':');
+    let gender = 'f';
+    let language = 'en-GB';
+    if (params) {
+      [language, gender] = params.split('/');
+    }
+    url = `https://shabda.ndre.gr/speech/${words}.json?gender=${gender}&language=${language}&strudel=1'`;
+  }
+  if (typeof fetch !== 'function') {
+    // not a browser
+    return;
+  }
+  const base = url.split('/').slice(0, -1).join('/');
+  if (typeof fetch === 'undefined') {
+    // skip fetch when in node / testing
+    return;
+  }
+  const json = await fetch(url)
+    .then((res) => res.json())
+    .catch((error) => {
+      console.error(error);
+      throw new Error(`error loading "${url}"`);
+    });
+  return [json, json._base || base];
+}
+
 // for some reason, only piano and flute work.. is it because mp3??
 
 async function loadSampleChannels(key, url) {
@@ -138,18 +91,27 @@ async function loadSampleChannels(key, url) {
 }
 
 let loaded = false;
-export async function doughsample() {
+export async function doughsamples(sampleMap, baseUrl) {
+  if (typeof sampleMap === 'string') {
+    const [json, base] = await fetchSampleMap(sampleMap);
+    // console.log('json', json, 'base', base);
+    return doughsamples(json, base);
+  }
   !doughWorklet && initDoughWorklet();
   if (loaded) {
     return;
   }
   loaded = true;
-  const sampleMap = await Promise.all(
-    Object.entries(samples).map(async ([key, url]) => {
-      url = url[0];
-      return loadSampleChannels(key, url);
-    }),
-  );
-  console.log('sampleMap', sampleMap);
-  doughWorklet.port.postMessage({ samples: sampleMap });
+  const json = (
+    await Promise.all(
+      Object.entries(sampleMap).map(async ([key, url]) => {
+        if (key !== '_base') {
+          url = baseUrl + url[0];
+          return loadSampleChannels(key, url);
+        }
+      }),
+    )
+  ).filter(Boolean);
+  // console.log('sampleMap', json);
+  doughWorklet.port.postMessage({ samples: json });
 }

From aeaed50446e6f31e0a722ed3f19b8bd99e25efbb Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Mon, 9 Jun 2025 15:18:47 +0200
Subject: [PATCH 38/52] gaincurve

---
 packages/supradough/dough.mjs | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 207638737..fe3786a05 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -1,6 +1,15 @@
 // this is dough, the superdough without dependencies
 const SAMPLE_RATE = typeof sampleRate !== 'undefined' ? sampleRate : 48000;
 const ISR = 1 / SAMPLE_RATE;
+
+let gainCurveFunc = (val) => Math.pow(val, 2);
+
+function applyGainCurve(val) {
+  return gainCurveFunc(val);
+}
+// function setGainCurve(newGainCurveFunc) {
+//   gainCurveFunc = newGainCurveFunc;
+// }
 // https://garten.salat.dev/audio-DSP/oscillators.html
 export class SineOsc {
   phase = 0;
@@ -522,15 +531,15 @@ export class DoughVoice {
     let $ = this;
     Object.assign($, value);
     $.s = $.s ?? getDefaultValue('s');
-    $.gain = $.gain ?? getDefaultValue('gain');
-    $.velocity = $.velocity ?? getDefaultValue('velocity');
-    $.postgain = $.postgain ?? getDefaultValue('postgain');
+    $.gain = applyGainCurve($.gain ?? getDefaultValue('gain'));
+    $.velocity = applyGainCurve($.velocity ?? getDefaultValue('velocity'));
+    $.postgain = applyGainCurve($.postgain ?? getDefaultValue('postgain'));
     $.density = $.density ?? getDefaultValue('density');
     $.fanchor = $.fanchor ?? getDefaultValue('fanchor');
     $.drive = $.drive ?? 0.69;
     $.phaserdepth = $.phaserdepth ?? getDefaultValue('phaserdepth');
-    $.shapevol = $.shapevol ?? getDefaultValue('shapevol');
-    $.distortvol = $.distortvol ?? getDefaultValue('distortvol');
+    $.shapevol = applyGainCurve($.shapevol ?? getDefaultValue('shapevol'));
+    $.distortvol = applyGainCurve($.distortvol ?? getDefaultValue('distortvol'));
     $.i = $.i ?? getDefaultValue('i');
     $.fft = $.fft ?? getDefaultValue('fft');
     $.pan = $.pan ?? getDefaultValue('pan');
@@ -582,7 +591,7 @@ export class DoughVoice {
     // gain envelope
     $._adsr = new ADSR({ decayCurve: 2 });
     // delay
-    $.delay = $.delay ?? getDefaultValue('delay');
+    $.delay = applyGainCurve($.delay ?? getDefaultValue('delay'));
     $.delayfeedback = $.delayfeedback ?? getDefaultValue('delayfeedback');
     $.delaytime = $.delaytime ?? getDefaultValue('delaytime');
 

From 3d300077563dd4f978b8315f6beeb5b9abfe3a8c Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Mon, 9 Jun 2025 15:55:44 +0200
Subject: [PATCH 39/52] supersaw

---
 packages/supradough/dough.mjs | 59 +++++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index fe3786a05..4af3b7118 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -45,8 +45,9 @@ function polyBlep(t, dt) {
   return 0;
 }
 export class SawOsc {
-  //phase = Math.random();
-  phase = 0;
+  constructor(props = {}) {
+    this.phase = props.phase ?? 0
+  }
   update(freq) {
     const dt = freq / SAMPLE_RATE;
     let p = polyBlep(this.phase, dt);
@@ -59,6 +60,59 @@ export class SawOsc {
   }
 }
 
+function getUnisonDetune(unison, detune, voiceIndex) {
+  if (unison < 2) {
+    return 0;
+  }
+  const lerp = (a, b, n) => {
+    return n * (b - a) + a;
+  }
+  return lerp(-detune * 0.5, detune * 0.5, voiceIndex / (unison - 1));
+}
+function applySemitoneDetuneToFrequency(frequency, detune) {
+  return frequency * Math.pow(2, detune / 12);
+}
+export class SupersawOsc {
+  constructor(props = {}) {
+    //TODO: figure out a good way to pass in these params
+    this.voices = props.voices ?? 5;
+    this.freqspread = props.freqspread ?? .2
+    this.panspread = props.panspread ?? 0.4;
+    this.phase = new Float32Array(this.voices).map(() => Math.random());
+  }
+  update(freq) {
+    const gain1 = Math.sqrt(1 - this.panspread);
+    const gain2 = Math.sqrt(this.panspread);
+    let sl = 0
+    let sr = 0
+    for (let n = 0; n < this.voices; n++) {
+      const freqAdjusted = applySemitoneDetuneToFrequency(freq, getUnisonDetune(this.voices, this.freqspread, n))
+      const dt = freqAdjusted / SAMPLE_RATE;
+      const isOdd = (n & 1) == 1;
+      let gainL = gain1;
+      let gainR = gain2;
+      // invert right and left gain
+      if (isOdd) {
+        gainL = gain2;
+        gainR = gain1;
+      }
+      let p = polyBlep(this.phase[n], dt);
+      let s = 2 * this.phase[n] - 1 - p;
+      sl = sl + s * gainL
+      sr = sr + s * gainL
+
+      this.phase[n] += dt;
+      if (this.phase[n] > 1) {
+        this.phase[n] -= 1;
+      }
+    }
+
+    return sl + sr
+    //TODO: make stereo
+    // return [sl, sr];
+  }
+}
+
 export class TriOsc {
   phase = 0;
   update(freq) {
@@ -453,6 +507,7 @@ let shapes = {
   zaw: ZawOsc,
   sawtooth: SawOsc,
   zawtooth: ZawOsc,
+  supersaw: SupersawOsc,
   tri: TriOsc,
   triangle: TriOsc,
   pulse: PulseOsc,

From e8254735bb3ad281bbaa4c0838cbe9a2fac7d2d7 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Mon, 9 Jun 2025 19:35:50 +0200
Subject: [PATCH 40/52] apply speed to synths and samples + add normalize flag
 (for fit)

---
 packages/supradough/dough.mjs | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 4af3b7118..b11de6c24 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -46,7 +46,7 @@ function polyBlep(t, dt) {
 }
 export class SawOsc {
   constructor(props = {}) {
-    this.phase = props.phase ?? 0
+    this.phase = props.phase ?? 0;
   }
   update(freq) {
     const dt = freq / SAMPLE_RATE;
@@ -66,7 +66,7 @@ function getUnisonDetune(unison, detune, voiceIndex) {
   }
   const lerp = (a, b, n) => {
     return n * (b - a) + a;
-  }
+  };
   return lerp(-detune * 0.5, detune * 0.5, voiceIndex / (unison - 1));
 }
 function applySemitoneDetuneToFrequency(frequency, detune) {
@@ -76,17 +76,17 @@ export class SupersawOsc {
   constructor(props = {}) {
     //TODO: figure out a good way to pass in these params
     this.voices = props.voices ?? 5;
-    this.freqspread = props.freqspread ?? .2
+    this.freqspread = props.freqspread ?? 0.2;
     this.panspread = props.panspread ?? 0.4;
     this.phase = new Float32Array(this.voices).map(() => Math.random());
   }
   update(freq) {
     const gain1 = Math.sqrt(1 - this.panspread);
     const gain2 = Math.sqrt(this.panspread);
-    let sl = 0
-    let sr = 0
+    let sl = 0;
+    let sr = 0;
     for (let n = 0; n < this.voices; n++) {
-      const freqAdjusted = applySemitoneDetuneToFrequency(freq, getUnisonDetune(this.voices, this.freqspread, n))
+      const freqAdjusted = applySemitoneDetuneToFrequency(freq, getUnisonDetune(this.voices, this.freqspread, n));
       const dt = freqAdjusted / SAMPLE_RATE;
       const isOdd = (n & 1) == 1;
       let gainL = gain1;
@@ -98,8 +98,8 @@ export class SupersawOsc {
       }
       let p = polyBlep(this.phase[n], dt);
       let s = 2 * this.phase[n] - 1 - p;
-      sl = sl + s * gainL
-      sr = sr + s * gainL
+      sl = sl + s * gainL;
+      sr = sr + s * gainL;
 
       this.phase[n] += dt;
       if (this.phase[n] > 1) {
@@ -107,7 +107,7 @@ export class SupersawOsc {
       }
     }
 
-    return sl + sr
+    return sl + sr;
     //TODO: make stereo
     // return [sl, sr];
   }
@@ -466,15 +466,22 @@ export class BufferPlayer {
   sampleRate;
   pos = 0;
   sampleFreq = note2freq();
-  constructor(buffer, sampleRate) {
+  constructor(buffer, sampleRate, normalize) {
     this.buffer = buffer;
     this.sampleRate = sampleRate;
+    this.duration = this.buffer.length / this.sampleRate;
+    this.speed = SAMPLE_RATE / this.sampleRate;
+    if (normalize) {
+      // this will make the buffer last 1s if freq = sampleFreq
+      // it's useful to loop samples (e.g. fit function)
+      this.speed *= this.duration;
+    }
   }
   update(freq) {
     if (this.pos >= this.buffer.length) {
       return 0;
     }
-    const speed = ((freq / this.sampleFreq) * SAMPLE_RATE) / this.sampleRate;
+    const speed = (freq / this.sampleFreq) * this.speed;
     let s = this.buffer[Math.floor(this.pos)];
     this.pos = this.pos + speed;
     return s;
@@ -551,6 +558,7 @@ const defaultDefaultValues = {
   pan: 0.5,
   fmh: 1,
   fmenv: 0, // differs from superdough
+  speed: 1,
 };
 
 let getDefaultValue = (key) => defaultDefaultValues[key];
@@ -603,6 +611,7 @@ export class DoughVoice {
     $.resonance = $.resonance ?? getDefaultValue('resonance');
     $.hresonance = $.hresonance ?? getDefaultValue('hresonance');
     $.bandq = $.bandq ?? getDefaultValue('bandq');
+    $.speed = $.speed ?? getDefaultValue('speed');
 
     [$.attack, $.decay, $.sustain, $.release] = getADSR([$.attack, $.decay, $.sustain, $.release]);
 
@@ -623,7 +632,7 @@ export class DoughVoice {
       $._buffers = [];
       $._channels = sample.channels.length;
       for (let i = 0; i < $._channels; i++) {
-        $._buffers.push(new BufferPlayer(sample.channels[i], sample.sampleRate));
+        $._buffers.push(new BufferPlayer(sample.channels[i], sample.sampleRate, $.unit === 'c')); // tbd unit === 'c'
       }
     } else {
       console.warn('sound not found', $.s);
@@ -695,7 +704,7 @@ export class DoughVoice {
     }
     let gate = Number(t >= this._begin && t <= this._holdEnd);
 
-    let freq = this.freq;
+    let freq = this.freq * this.speed;
     // frequency modulation
     if (this._fm) {
       let fmi = this.fmi;

From c9f494d8657e5990ded89a02dbaf8ab80caa1e40 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Mon, 9 Jun 2025 22:10:09 +0200
Subject: [PATCH 41/52] fix: node export

---
 packages/supradough/dough-export.mjs | 3 ++-
 packages/supradough/dough.mjs        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/supradough/dough-export.mjs b/packages/supradough/dough-export.mjs
index 5f8b9a8ee..a9f5614b0 100644
--- a/packages/supradough/dough-export.mjs
+++ b/packages/supradough/dough-export.mjs
@@ -47,7 +47,8 @@ haps.forEach((hap) => {
 console.log(`render ${seconds}s long buffer...`);
 const buffer = new Float32Array(seconds * sampleRate);
 while (dough.t <= buffer.length) {
-  buffer[dough.t] = dough.update();
+  dough.update();
+  buffer[dough.t] = dough.out[0];
 }
 console.log('done!');
 
diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index b11de6c24..aa2e1dfd5 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -150,7 +150,7 @@ class PulseOsc {
     return 2 * phase - 1 - p;
   }
   update(freq, pw = 0.5) {
-    const dt = freq / sampleRate;
+    const dt = freq / SAMPLE_RATE;
     let pulse = this.saw(0, dt) - this.saw(pw, dt);
     this.phase = (this.phase + dt) % 1;
     return pulse + pw * 2 - 1;

From e99adffc562e6495b02d19d8d66fc684935a77ec Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Mon, 9 Jun 2025 22:29:35 +0200
Subject: [PATCH 42/52] vibrato

---
 packages/supradough/dough.mjs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index aa2e1dfd5..8a648a449 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -643,6 +643,11 @@ export class DoughVoice {
       [$.pattack, $.pdecay, $.psustain, $.prelease] = getADSR([$.pattack, $.pdecay, $.psustain, $.prelease]);
     }
 
+    if ($.vib) {
+      $._vib = new SineOsc();
+      $.vibmod = $.vibmod ?? getDefaultValue('vibmod');
+    }
+
     if ($.fmi) {
       $._fm = new SineOsc();
       $.fmh = $.fmh ?? getDefaultValue('fmh');
@@ -705,6 +710,7 @@ export class DoughVoice {
     let gate = Number(t >= this._begin && t <= this._holdEnd);
 
     let freq = this.freq * this.speed;
+
     // frequency modulation
     if (this._fm) {
       let fmi = this.fmi;
@@ -717,6 +723,11 @@ export class DoughVoice {
       freq = freq + this._fm.update(modfreq) * modgain;
     }
 
+    // vibrato
+    if (this._vib) {
+      freq = freq * 2 ** ((this._vib.update(this.vib) * this.vibmod) / 12);
+    }
+
     // pitch envelope
     if (this._penv) {
       const env = this._penv.update(t, gate, this.pattack, this.pdecay, this.psustain, this.prelease);

From 3963b807ebb35815890858e2d09bfadbc9e8a9f4 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Mon, 9 Jun 2025 22:32:41 +0200
Subject: [PATCH 43/52] fix: calling doughsamples multiple times

---
 packages/webaudio/supradough.mjs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/webaudio/supradough.mjs b/packages/webaudio/supradough.mjs
index 3b45415df..d9775642e 100644
--- a/packages/webaudio/supradough.mjs
+++ b/packages/webaudio/supradough.mjs
@@ -90,18 +90,12 @@ async function loadSampleChannels(key, url) {
   return [key, channels, buffer.sampleRate];
 }
 
-let loaded = false;
 export async function doughsamples(sampleMap, baseUrl) {
   if (typeof sampleMap === 'string') {
     const [json, base] = await fetchSampleMap(sampleMap);
     // console.log('json', json, 'base', base);
     return doughsamples(json, base);
   }
-  !doughWorklet && initDoughWorklet();
-  if (loaded) {
-    return;
-  }
-  loaded = true;
   const json = (
     await Promise.all(
       Object.entries(sampleMap).map(async ([key, url]) => {
@@ -113,5 +107,6 @@ export async function doughsamples(sampleMap, baseUrl) {
     )
   ).filter(Boolean);
   // console.log('sampleMap', json);
+  !doughWorklet && initDoughWorklet();
   doughWorklet.port.postMessage({ samples: json });
 }

From 7e8206dcbc67570c5001869e86251199c0fd5ad7 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Tue, 10 Jun 2025 12:31:21 +0200
Subject: [PATCH 44/52] pitched delay

---
 packages/core/controls.mjs    | 19 ++++++++++++---
 packages/supradough/dough.mjs | 45 +++++++++++++++++++++++------------
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 21c183da9..9c9bdbc8c 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -964,14 +964,27 @@ export const { delay } = registerControl(['delay', 'delaytime', 'delayfeedback']
  *
  */
 export const { delayfeedback, delayfb, dfb } = registerControl('delayfeedback', 'delayfb', 'dfb');
+
+/**
+ * Sets the level of the signal that is fed back into the delay.
+ * Caution: Values >= 1 will result in a signal that gets louder and louder! Don't do it
+ *
+ * @name delayfeedback
+ * @param {number | Pattern} feedback between 0 and 1
+ * @synonyms delayfb, dfb
+ * @example
+ * s("bd").delay(.25).delayfeedback("<.25 .5 .75 1>")
+ *
+ */
+export const { delayspeed } = registerControl('delayspeed');
 /**
  * Sets the time of the delay effect.
  *
- * @name delaytime
- * @param {number | Pattern} seconds between 0 and Infinity
+ * @name delayspeed
+ * @param {number | Pattern} delayspeed controls the pitch of the delay feedback
  * @synonyms delayt, dt
  * @example
- * s("bd bd").delay(.25).delaytime("<.125 .25 .5 1>")
+ * note("d d a# a".fast(2)).s("sawtooth").delay(.8).delaytime(1/2).delayspeed("<2 .5 -1 -2>")
  *
  */
 export const { delaytime, delayt, dt } = registerControl('delaytime', 'delayt', 'dt');
diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 8a648a449..8e3544c9f 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -44,6 +44,7 @@ function polyBlep(t, dt) {
   // 0 otherwise
   return 0;
 }
+
 export class SawOsc {
   constructor(props = {}) {
     this.phase = props.phase ?? 0;
@@ -349,21 +350,31 @@ export class ADSR {
 .out()*/
 const MAX_DELAY_TIME = 10;
 export class Delay {
-  writeIdx = 0;
-  readIdx = 0;
-  buffer = new Float32Array(MAX_DELAY_TIME * SAMPLE_RATE); //.fill(0)
-  write(s, delayTime) {
-    this.writeIdx = (this.writeIdx + 1) % this.buffer.length;
-    this.buffer[this.writeIdx] = s;
-    // Calculate how far in the past to read
-    let numSamples = Math.min(Math.floor(SAMPLE_RATE * delayTime), this.buffer.length - 1);
-    this.readIdx = this.writeIdx - numSamples;
-    // If past the start of the buffer, wrap around
-    if (this.readIdx < 0) this.readIdx += this.buffer.length;
+  constructor(_props = {}) {
+    this.buffer = new Float32Array(MAX_DELAY_TIME * SAMPLE_RATE);
+    this.writeIdx = 0;
+    this.readIdx = 0;
+    this.numSamples = 0;
   }
-  update(input, delayTime) {
+  write(s, delayTime) {
+    // Calculate how far in the past to read
+    this.numSamples = Math.min(Math.floor(SAMPLE_RATE * delayTime), this.buffer.length - 1);
+    this.writeIdx = (this.writeIdx + 1) % this.numSamples;
+    this.buffer[this.writeIdx] = s;
+    this.readIdx = this.writeIdx - this.numSamples + 1;
+
+    // If past the start of the buffer, wrap around (Q: is this possible?)
+    if (this.readIdx < 0) this.readIdx += this.numSamples;
+  }
+  update(input, delayTime, speed = 1) {
     this.write(input, delayTime);
-    return this.buffer[this.readIdx];
+    let index = this.readIdx;
+    if (speed < 0) {
+      index = this.numSamples - Math.floor(Math.abs(this.readIdx * speed) % this.numSamples);
+    } else {
+      index = Math.floor(this.readIdx * speed) % this.numSamples;
+    }
+    return this.buffer[index];
   }
 }
 
@@ -550,6 +561,7 @@ const defaultDefaultValues = {
   delay: 0,
   byteBeatExpression: '0',
   delayfeedback: 0.5,
+  delayspeed: 1,
   delaytime: 0.25,
   orbit: 1,
   i: 1,
@@ -662,6 +674,7 @@ export class DoughVoice {
     // delay
     $.delay = applyGainCurve($.delay ?? getDefaultValue('delay'));
     $.delayfeedback = $.delayfeedback ?? getDefaultValue('delayfeedback');
+    $.delayspeed = $.delayspeed ?? getDefaultValue('delayspeed');
     $.delaytime = $.delaytime ?? getDefaultValue('delaytime');
 
     // precalculated values
@@ -822,6 +835,7 @@ export class Dough {
   delaysend = [0, 0];
   delaytime = getDefaultValue('delaytime');
   delayfeedback = getDefaultValue('delayfeedback');
+  delayspeed = getDefaultValue('delayspeed');
   t = 0;
   // sampleRate: number, currentTime: number (seconds)
   constructor(sampleRate = 48000, currentTime = 0) {
@@ -897,12 +911,13 @@ export class Dough {
         this.delaysend[0] += this.voices[v].out[0] * this.voices[v].delay;
         this.delaysend[1] += this.voices[v].out[1] * this.voices[v].delay;
         this.delaytime = this.voices[v].delaytime; // we trust that these are initialized in the voice
+        this.delayspeed = this.voices[v].delayspeed; // we trust that these are initialized in the voice
         this.delayfeedback = this.voices[v].delayfeedback;
       }
     }
     // todo: how to change delaytime / delayfeedback from a voice?
-    const delayL = this._delayL.update(this.delaysend[0], this.delaytime);
-    const delayR = this._delayR.update(this.delaysend[1], this.delaytime);
+    const delayL = this._delayL.update(this.delaysend[0], this.delaytime, this.delayspeed);
+    const delayR = this._delayR.update(this.delaysend[1], this.delaytime, this.delayspeed);
     this.delaysend[0] = delayL * this.delayfeedback;
     this.delaysend[1] = delayR * this.delayfeedback;
     this.out[0] += delayL;

From 43504d16b66e739590ec80c4fd18e10f54c31802 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Tue, 10 Jun 2025 16:03:42 +0200
Subject: [PATCH 45/52] add chorus

---
 packages/core/controls.mjs    | 11 ++++++
 packages/supradough/dough.mjs | 64 ++++++++++++++++++++++++++++++++---
 2 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 9c9bdbc8c..ed440b56d 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -285,6 +285,17 @@ export const { fmvelocity } = registerControl('fmvelocity');
  */
 export const { bank } = registerControl('bank');
 
+/**
+ * mix control for the chorus effect
+ *
+ * @name chorus
+ * @param {string | Pattern} chorus mix amount between 0 and 1
+ * @example
+ * note("d d a# a").s("sawtooth").chorus(.5)
+ *
+ */
+export const { chorus } = registerControl('chorus');
+
 // analyser node send amount 0 - 1 (used by scope)
 export const { analyze } = registerControl('analyze');
 // fftSize of analyser
diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 8e3544c9f..6be0af78c 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -7,6 +7,22 @@ let gainCurveFunc = (val) => Math.pow(val, 2);
 function applyGainCurve(val) {
   return gainCurveFunc(val);
 }
+
+/**
+ * Equal Power Crossfade function.
+ * Smoothly transitions between signals A and B, maintaining consistent perceived loudness.
+ *
+ * @param {number} a - Signal A (can be a single value or an array value in buffer processing).
+ * @param {number} b - Signal B (can be a single value or an array value in buffer processing).
+ * @param {number} m - Crossfade parameter (0.0 = all A, 1.0 = all B, 0.5 = equal mix).
+ * @returns {number} Crossfaded output value.
+ */
+function crossfade(a, b, m) {
+  const aGain = Math.sin((1 - m) * 0.5 * Math.PI);
+  const bGain = Math.sin(m * 0.5 * Math.PI);
+  return a * aGain + b * bGain;
+}
+
 // function setGainCurve(newGainCurveFunc) {
 //   gainCurveFunc = newGainCurveFunc;
 // }
@@ -349,7 +365,8 @@ export class ADSR {
 .add(x=>x.delay(.1).mul(.8))
 .out()*/
 const MAX_DELAY_TIME = 10;
-export class Delay {
+export class PitchDelay {
+  lpf = new TwoPoleFilter();
   constructor(_props = {}) {
     this.buffer = new Float32Array(MAX_DELAY_TIME * SAMPLE_RATE);
     this.writeIdx = 0;
@@ -374,7 +391,38 @@ export class Delay {
     } else {
       index = Math.floor(this.readIdx * speed) % this.numSamples;
     }
-    return this.buffer[index];
+    const s = this.lpf.update(this.buffer[index], 0.9, 0);
+
+    return s;
+  }
+}
+
+export class Delay {
+  writeIdx = 0;
+  readIdx = 0;
+  buffer = new Float32Array(MAX_DELAY_TIME * SAMPLE_RATE); //.fill(0)
+  write(s, delayTime) {
+    this.writeIdx = (this.writeIdx + 1) % this.buffer.length;
+    this.buffer[this.writeIdx] = s;
+    // Calculate how far in the past to read
+    let numSamples = Math.min(Math.floor(SAMPLE_RATE * delayTime), this.buffer.length - 1);
+    this.readIdx = this.writeIdx - numSamples;
+    // If past the start of the buffer, wrap around
+    if (this.readIdx < 0) this.readIdx += this.buffer.length;
+  }
+  update(input, delayTime) {
+    this.write(input, delayTime);
+    return this.buffer[this.readIdx];
+  }
+}
+//TODO: Figure out why clicking at the start off the buffer
+export class Chorus {
+  delay = new Delay();
+  modulator = new TriOsc();
+  update(input, mix, delayTime, modulationFreq, modulationDepth) {
+    const m = this.modulator.update(modulationFreq) * modulationDepth;
+    const c = this.delay.update(input, delayTime * (1 + m));
+    return crossfade(input, c, mix);
   }
 }
 
@@ -540,6 +588,7 @@ let shapes = {
 };
 
 const defaultDefaultValues = {
+  chorus: 0,
   note: 48,
   s: 'triangle',
   gain: 1,
@@ -616,6 +665,7 @@ export class DoughVoice {
     $.shapevol = applyGainCurve($.shapevol ?? getDefaultValue('shapevol'));
     $.distortvol = applyGainCurve($.distortvol ?? getDefaultValue('distortvol'));
     $.i = $.i ?? getDefaultValue('i');
+    $.chorus = $.chorus ?? getDefaultValue('chorus');
     $.fft = $.fft ?? getDefaultValue('fft');
     $.pan = $.pan ?? getDefaultValue('pan');
     $.orbit = $.orbit ?? getDefaultValue('orbit');
@@ -696,6 +746,7 @@ export class DoughVoice {
     }
 
     // channelwise effects setup
+    $._chorus = $.chorus ? [] : null;
     $._lpf = $.cutoff ? [] : null;
     $._hpf = $.hcutoff ? [] : null;
     $._bpf = $.bandf ? [] : null;
@@ -706,6 +757,7 @@ export class DoughVoice {
       $._lpf?.push(new TwoPoleFilter());
       $._hpf?.push(new TwoPoleFilter());
       $._bpf?.push(new TwoPoleFilter());
+      $._chorus?.push(new Chorus());
       $._coarse?.push(new Coarse());
       $._crush?.push(new Crush());
       $._distort?.push(new Distort());
@@ -786,6 +838,10 @@ export class DoughVoice {
         this.out[i] = this._buffers[i].update(freq);
       }
       this.out[i] = this.out[i] * this.gain * this.velocity;
+      if (this._chorus) {
+        const c = this._chorus[i].update(this.out[i], this.chorus, 0.03 + 0.05 * i, 1, 0.11);
+        this.out[i] = c + this.out[i];
+      }
 
       if (this._lpf) {
         this._lpf[i].update(this.out[i], lpf, this.resonance);
@@ -842,8 +898,8 @@ export class Dough {
     this.sampleRate = sampleRate;
     this.t = Math.floor(currentTime * sampleRate); // samples
     // console.log('init dough', this.sampleRate, this.t);
-    this._delayL = new Delay();
-    this._delayR = new Delay();
+    this._delayL = new PitchDelay();
+    this._delayR = new PitchDelay();
   }
   loadSample(name, channels, sampleRate) {
     BufferPlayer.samples.set(name, { channels, sampleRate });

From bbd7ed0f27f1b49eefb674afa70ea8fe1acbcbe8 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Thu, 12 Jun 2025 02:25:04 +0200
Subject: [PATCH 46/52] lazy sample loading

---
 packages/webaudio/supradough.mjs | 48 ++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/packages/webaudio/supradough.mjs b/packages/webaudio/supradough.mjs
index d9775642e..10664aa89 100644
--- a/packages/webaudio/supradough.mjs
+++ b/packages/webaudio/supradough.mjs
@@ -16,11 +16,35 @@ function initDoughWorklet() {
   connectToDestination(doughWorklet); // channels?
 }
 
+const soundMap = new Map();
+const loadedSounds = new Map();
+
 Pattern.prototype.supradough = function () {
   return this.onTrigger((_, hap, __, cps, begin) => {
     hap.value._begin = begin;
     hap.value._duration = hap.duration / cps;
     !doughWorklet && initDoughWorklet();
+    const s = (hap.value.bank ? hap.value.bank + '_' : '') + hap.value.s;
+    const n = hap.value.n ?? 0;
+    const soundKey = `${s}:${n}`;
+    if (soundMap.has(s)) {
+      hap.value.s = soundKey; // dough.mjs is unaware of bank and n (only maps keys to buffers)
+    }
+    if (soundMap.has(s) && !loadedSounds.has(soundKey)) {
+      const urls = soundMap.get(s);
+      const url = urls[n % urls.length];
+      console.log(`load ${soundKey} from ${url}`);
+      const loadSample = fetchSample(url);
+      loadedSounds.set(soundKey, loadSample);
+      loadSample.then(({ channels, sampleRate }) =>
+        doughWorklet.port.postMessage({
+          sample: soundKey,
+          channels,
+          sampleRate,
+        }),
+      );
+    }
+
     doughWorklet.port.postMessage({ spawn: hap.value });
   }, 1);
 };
@@ -79,7 +103,7 @@ export async function fetchSampleMap(url) {
 
 // for some reason, only piano and flute work.. is it because mp3??
 
-async function loadSampleChannels(key, url) {
+async function fetchSample(url) {
   const buffer = await fetch(url)
     .then((res) => res.arrayBuffer())
     .then((buf) => getAudioContext().decodeAudioData(buf));
@@ -87,7 +111,7 @@ async function loadSampleChannels(key, url) {
   for (let i = 0; i < buffer.numberOfChannels; i++) {
     channels.push(buffer.getChannelData(i));
   }
-  return [key, channels, buffer.sampleRate];
+  return { channels, sampleRate: buffer.sampleRate };
 }
 
 export async function doughsamples(sampleMap, baseUrl) {
@@ -96,17 +120,11 @@ export async function doughsamples(sampleMap, baseUrl) {
     // console.log('json', json, 'base', base);
     return doughsamples(json, base);
   }
-  const json = (
-    await Promise.all(
-      Object.entries(sampleMap).map(async ([key, url]) => {
-        if (key !== '_base') {
-          url = baseUrl + url[0];
-          return loadSampleChannels(key, url);
-        }
-      }),
-    )
-  ).filter(Boolean);
-  // console.log('sampleMap', json);
-  !doughWorklet && initDoughWorklet();
-  doughWorklet.port.postMessage({ samples: json });
+  Object.entries(sampleMap).map(async ([key, urls]) => {
+    if (key !== '_base') {
+      urls = urls.map((url) => baseUrl + url);
+      // console.log('set', key, urls);
+      soundMap.set(key, urls);
+    }
+  });
 }

From 5cbd38a3e83b0b29414675bee6a1a961a13c93fa Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Thu, 12 Jun 2025 02:25:46 +0200
Subject: [PATCH 47/52] improve filter performance making it accept hz directly

---
 packages/supradough/dough.mjs | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/packages/supradough/dough.mjs b/packages/supradough/dough.mjs
index 6be0af78c..711922b63 100644
--- a/packages/supradough/dough.mjs
+++ b/packages/supradough/dough.mjs
@@ -1,5 +1,6 @@
 // this is dough, the superdough without dependencies
 const SAMPLE_RATE = typeof sampleRate !== 'undefined' ? sampleRate : 48000;
+const PI_DIV_SR = Math.PI / SAMPLE_RATE;
 const ISR = 1 / SAMPLE_RATE;
 
 let gainCurveFunc = (val) => Math.pow(val, 2);
@@ -145,11 +146,13 @@ export class TwoPoleFilter {
   s1 = 0;
   update(s, cutoff, resonance = 0) {
     // Out of bound values can produce NaNs
-    cutoff = Math.min(cutoff, 1);
     resonance = Math.max(resonance, 0);
-    var c = Math.pow(0.5, (1 - cutoff) / 0.125);
-    var r = Math.pow(0.5, (resonance + 0.125) / 0.125);
-    var mrc = 1 - r * c;
+
+    cutoff = Math.min(cutoff, 20000);
+    const c = 2 * Math.sin(cutoff * PI_DIV_SR);
+
+    const r = Math.pow(0.5, (resonance + 0.125) / 0.125);
+    const mrc = 1 - r * c;
 
     this.s0 = mrc * this.s0 - c * this.s1 + c * s; // bpf
     this.s1 = mrc * this.s1 + c * this.s0; // lpf
@@ -591,6 +594,7 @@ const defaultDefaultValues = {
   chorus: 0,
   note: 48,
   s: 'triangle',
+  bank: '',
   gain: 1,
   postgain: 1,
   velocity: 1,
@@ -620,6 +624,7 @@ const defaultDefaultValues = {
   fmh: 1,
   fmenv: 0, // differs from superdough
   speed: 1,
+  pw: 0.5,
 };
 
 let getDefaultValue = (key) => defaultDefaultValues[key];
@@ -674,14 +679,14 @@ export class DoughVoice {
     $.hresonance = $.hresonance ?? getDefaultValue('hresonance');
     $.bandq = $.bandq ?? getDefaultValue('bandq');
     $.speed = $.speed ?? getDefaultValue('speed');
+    $.pw = $.pw ?? getDefaultValue('pw');
 
     [$.attack, $.decay, $.sustain, $.release] = getADSR([$.attack, $.decay, $.sustain, $.release]);
 
     $._holdEnd = $._begin + $._duration; // needed for gate
     $._end = $._holdEnd + $.release + 0.01; // needed for despawn
 
-    $.s ??= 'triangle';
-    if ($.s === 'saw' || $.s === 'sawtooth') {
+    if ($.fmi && ($.s === 'saw' || $.s === 'sawtooth')) {
       $.s = 'zaw'; // polyblepped saw when fm is applied
     }
 
@@ -697,7 +702,7 @@ export class DoughVoice {
         $._buffers.push(new BufferPlayer(sample.channels[i], sample.sampleRate, $.unit === 'c')); // tbd unit === 'c'
       }
     } else {
-      console.warn('sound not found', $.s);
+      console.warn('sound not loaded', $.s);
     }
 
     if ($.penv) {
@@ -727,10 +732,6 @@ export class DoughVoice {
     $.delayspeed = $.delayspeed ?? getDefaultValue('delayspeed');
     $.delaytime = $.delaytime ?? getDefaultValue('delaytime');
 
-    // precalculated values
-    $.piOverSr = Math.PI / value.sampleRate;
-    $.eighthOverLogHalf = 0.125 / Math.log(0.5);
-
     // filter setup
     if ($.lpenv) {
       $._lpenv = new ADSR({ decayCurve: 4 });
@@ -763,11 +764,6 @@ export class DoughVoice {
       $._distort?.push(new Distort());
     }
   }
-  // credits to pulu: https://github.com/felixroos/kabelsalat/issues/35
-  freq2cutoff(freq) {
-    const c = 2 * Math.sin(freq * this.piOverSr);
-    return 1 - Math.log(c) * this.eighthOverLogHalf;
-  }
   update(t) {
     if (!this._sound && !this._buffers) {
       return 0;
@@ -806,7 +802,6 @@ export class DoughVoice {
         const env = this._lpenv.update(t, gate, this.lpattack, this.lpdecay, this.lpsustain, this.lprelease);
         lpf = this.lpenv * env * lpf + lpf;
       }
-      lpf = this.freq2cutoff(lpf);
     }
     let hpf = this.hcutoff;
     if (this._hpf) {
@@ -814,7 +809,6 @@ export class DoughVoice {
         const env = this._hpenv.update(t, gate, this.hpattack, this.hpdecay, this.hpsustain, this.hprelease);
         hpf = 2 ** this.hpenv * env * hpf + hpf;
       }
-      hpf = this.freq2cutoff(hpf);
     }
     let bpf = this.bandf;
     if (this._bpf) {
@@ -822,7 +816,6 @@ export class DoughVoice {
         const env = this._bpenv.update(t, gate, this.bpattack, this.bpdecay, this.bpsustain, this.bprelease);
         bpf = 2 ** this.bpenv * env * bpf + bpf;
       }
-      bpf = this.freq2cutoff(bpf);
     }
     // gain envelope
     const env = this._adsr.update(t, gate, this.attack, this.decay, this.sustain, this.release);
@@ -831,7 +824,7 @@ export class DoughVoice {
     for (let i = 0; i < this._channels; i++) {
       // sound source
       if (this._sound && this.s === 'pulse') {
-        this.out[i] = this._sound.update(freq, this.pw ?? 0.5);
+        this.out[i] = this._sound.update(freq, this.pw);
       } else if (this._sound) {
         this.out[i] = this._sound.update(freq);
       } else if (this._buffers) {

From 3caf08e199a7f210094cae213e934ead30750933 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Thu, 12 Jun 2025 02:26:08 +0200
Subject: [PATCH 48/52] up latency

---
 packages/superdough/superdough.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index 2629790df..ef43d7906 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -174,7 +174,7 @@ export const resetLoadedSounds = () => soundMap.set({});
 let audioContext;
 
 export const setDefaultAudioContext = () => {
-  audioContext = new AudioContext();
+  audioContext = new AudioContext({ latencyHint: 'playback' });
   return audioContext;
 };
 

From 14193abe0315dcd54d17ba2680f85bdf0373ca9b Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Thu, 12 Jun 2025 02:26:50 +0200
Subject: [PATCH 49/52] improve export: add stereo + measure performance + add
 bigger pattern for testing

---
 packages/supradough/dough-export.mjs | 103 +++++++++++++++++++++------
 1 file changed, 82 insertions(+), 21 deletions(-)

diff --git a/packages/supradough/dough-export.mjs b/packages/supradough/dough-export.mjs
index a9f5614b0..a6c55bf46 100644
--- a/packages/supradough/dough-export.mjs
+++ b/packages/supradough/dough-export.mjs
@@ -16,23 +16,72 @@ await evalScope(
 miniAllStrings(); // allows using single quotes for mini notation / skip transpilation
 
 let sampleRate = 48000,
-  cps = 0.5;
+  cps = 0.4;
 
-let pat = note('[c e g b]*3')
-  .add(note(7))
-  .lpf(sine.rangex(200, 4000).slow(2))
-  .lpq(0.3)
-  .s('<pulse saw tri>*2')
-  .att(0.01)
-  .rel(0.2)
-  .clip(2)
-  .delay(0.5)
-  .jux(rev)
-  .sometimes(add(note(12)))
-  .gain(0.25)
+/* await doughsamples('github:eddyflux/crate');
+await doughsamples('github:eddyflux/wax'); */
+
+let pat = note('c,eb,g,<bb c4 d4 eb4>')
+  .s('sine')
+  .press()
+  .add(note(24))
+  .fmi(3)
+  .fmh(5.01)
+  .dec(0.4)
+  .delay('.6:<.12 .22>:.8')
+  .jux(press)
+  .rarely(add(note('12')))
+  .lpf(400)
+  .lpq(0.2)
+  .lpd(0.4)
+  .lpenv(3)
+  .fmdecay(0.4)
+  .fmenv(1)
+  .postgain(0.6)
+  .stack(s('<pink white>*8').dec(0.07).rarely(ply('2')).delay(0.5).hpf(sine.range(200, 2000).slow(4)).hpq(0.2))
+  .stack(
+    s('[- white@3]*2')
+      .dec(0.4)
+      .hpf('<2000!3 <4000 8000>>*4')
+      .hpq(0.6)
+      .ply('<1 2>*4')
+      .postgain(0.5)
+      .delay(0.5)
+      .jux(rev)
+      .lpf(5000),
+  )
+  .stack(
+    note('<c2 - [- f1] ->*2')
+      .s('square')
+      .lpf(sine.range(100, 300).slow(4))
+      .lpe(1)
+      .segment(8)
+      .lpd(0.3)
+      .lpq(0.2)
+      .dec(0.2)
+      .speed('<1 2>')
+      .ply('<1 2>')
+      .postgain(1),
+  )
+  .stack(
+    chord('<Cm Cm7 Cm9 Cm11 Fm Fm7 Fm9 Fm11>')
+      .voicing()
+      .s('<sine>')
+      .clip(1)
+      .rel(0.4)
+      .vib('4:.2')
+      .gain(0.7)
+      .hpf(1200)
+      .fm(0.5)
+      .att(1)
+      .lpa(0.5)
+      .lpf(200)
+      .lpenv(4)
+      .chorus(0.8),
+  )
   .slow(1 / cps);
 
-let cycles = 4;
+let cycles = 30;
 let seconds = cycles + 1; // 1s release tail
 const haps = pat.queryArc(0, cycles);
 
@@ -41,20 +90,32 @@ const dough = new Dough(sampleRate);
 console.log('spawn voices...');
 haps.forEach((hap) => {
   hap.value._begin = Number(hap.whole.begin);
-  hap.value._duration = hap.duration / cps;
+  hap.value._duration = hap.duration/*  / cps */;
   dough.scheduleSpawn(hap.value);
 });
-console.log(`render ${seconds}s long buffer...`);
-const buffer = new Float32Array(seconds * sampleRate);
-while (dough.t <= buffer.length) {
+console.log(`render ${seconds}s long buffer, each dot is 1 second:`);
+const buffers = [new Float32Array(seconds * sampleRate), new Float32Array(seconds * sampleRate)];
+let t = performance.now();
+while (dough.t <= buffers[0].length) {
   dough.update();
-  buffer[dough.t] = dough.out[0];
+  buffers[0][dough.t] = dough.out[0];
+  buffers[1][dough.t] = dough.out[1];
+  if (dough.t % sampleRate === 0) {
+    process.stdout.write('.');
+  }
 }
-console.log('done!');
+const took = (performance.now() - t) / 1000;
+const load = (took / seconds) * 100;
+const speed = (seconds / took).toFixed(2);
+console.log('');
+console.log(`done!
+rendered ${seconds}s in ${took.toFixed(2)}s 
+speed: ${speed}x
+load: ${load.toFixed(2)}%`);
 
 const patternAudio = {
   sampleRate,
-  channelData: [buffer],
+  channelData: buffers,
 };
 
 WavEncoder.encode(patternAudio).then((buffer) => {

From 8363ba5a41ca3210d6cd4b436ead3692d7d29d3c Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Thu, 12 Jun 2025 10:22:35 +0200
Subject: [PATCH 50/52] format

---
 packages/supradough/dough-export.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/supradough/dough-export.mjs b/packages/supradough/dough-export.mjs
index a6c55bf46..bd4b530b3 100644
--- a/packages/supradough/dough-export.mjs
+++ b/packages/supradough/dough-export.mjs
@@ -90,7 +90,7 @@ const dough = new Dough(sampleRate);
 console.log('spawn voices...');
 haps.forEach((hap) => {
   hap.value._begin = Number(hap.whole.begin);
-  hap.value._duration = hap.duration/*  / cps */;
+  hap.value._duration = hap.duration /*  / cps */;
   dough.scheduleSpawn(hap.value);
 });
 console.log(`render ${seconds}s long buffer, each dot is 1 second:`);

From 239987af0b70169d6db451f277a3f24da59ca203 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Thu, 12 Jun 2025 10:23:06 +0200
Subject: [PATCH 51/52] snapshot

---
 test/__snapshots__/examples.test.mjs.snap | 67 +++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/test/__snapshots__/examples.test.mjs.snap b/test/__snapshots__/examples.test.mjs.snap
index 0eacfdfb0..e3df24d47 100644
--- a/test/__snapshots__/examples.test.mjs.snap
+++ b/test/__snapshots__/examples.test.mjs.snap
@@ -1847,6 +1847,27 @@ exports[`runs examples > example "chop" example index 0 1`] = `
 ]
 `;
 
+exports[`runs examples > example "chorus" example index 0 1`] = `
+[
+  "[ 0/1 → 1/4 | note:d s:sawtooth chorus:0.5 ]",
+  "[ 1/4 → 1/2 | note:d s:sawtooth chorus:0.5 ]",
+  "[ 1/2 → 3/4 | note:a# s:sawtooth chorus:0.5 ]",
+  "[ 3/4 → 1/1 | note:a s:sawtooth chorus:0.5 ]",
+  "[ 1/1 → 5/4 | note:d s:sawtooth chorus:0.5 ]",
+  "[ 5/4 → 3/2 | note:d s:sawtooth chorus:0.5 ]",
+  "[ 3/2 → 7/4 | note:a# s:sawtooth chorus:0.5 ]",
+  "[ 7/4 → 2/1 | note:a s:sawtooth chorus:0.5 ]",
+  "[ 2/1 → 9/4 | note:d s:sawtooth chorus:0.5 ]",
+  "[ 9/4 → 5/2 | note:d s:sawtooth chorus:0.5 ]",
+  "[ 5/2 → 11/4 | note:a# s:sawtooth chorus:0.5 ]",
+  "[ 11/4 → 3/1 | note:a s:sawtooth chorus:0.5 ]",
+  "[ 3/1 → 13/4 | note:d s:sawtooth chorus:0.5 ]",
+  "[ 13/4 → 7/2 | note:d s:sawtooth chorus:0.5 ]",
+  "[ 7/2 → 15/4 | note:a# s:sawtooth chorus:0.5 ]",
+  "[ 15/4 → 4/1 | note:a s:sawtooth chorus:0.5 ]",
+]
+`;
+
 exports[`runs examples > example "chunk" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:A4 ]",
@@ -2505,6 +2526,52 @@ exports[`runs examples > example "delayfeedback" example index 0 1`] = `
 ]
 `;
 
+exports[`runs examples > example "delayfeedback" example index 0 2`] = `
+[
+  "[ 0/1 → 1/1 | s:bd delay:0.25 delayfeedback:0.25 ]",
+  "[ 1/1 → 2/1 | s:bd delay:0.25 delayfeedback:0.5 ]",
+  "[ 2/1 → 3/1 | s:bd delay:0.25 delayfeedback:0.75 ]",
+  "[ 3/1 → 4/1 | s:bd delay:0.25 delayfeedback:1 ]",
+]
+`;
+
+exports[`runs examples > example "delayspeed" example index 0 1`] = `
+[
+  "[ 0/1 → 1/8 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:2 ]",
+  "[ 1/8 → 1/4 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:2 ]",
+  "[ 1/4 → 3/8 | note:a# s:sawtooth delay:0.8 delaytime:0.5 delayspeed:2 ]",
+  "[ 3/8 → 1/2 | note:a s:sawtooth delay:0.8 delaytime:0.5 delayspeed:2 ]",
+  "[ 1/2 → 5/8 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:2 ]",
+  "[ 5/8 → 3/4 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:2 ]",
+  "[ 3/4 → 7/8 | note:a# s:sawtooth delay:0.8 delaytime:0.5 delayspeed:2 ]",
+  "[ 7/8 → 1/1 | note:a s:sawtooth delay:0.8 delaytime:0.5 delayspeed:2 ]",
+  "[ 1/1 → 9/8 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:0.5 ]",
+  "[ 9/8 → 5/4 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:0.5 ]",
+  "[ 5/4 → 11/8 | note:a# s:sawtooth delay:0.8 delaytime:0.5 delayspeed:0.5 ]",
+  "[ 11/8 → 3/2 | note:a s:sawtooth delay:0.8 delaytime:0.5 delayspeed:0.5 ]",
+  "[ 3/2 → 13/8 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:0.5 ]",
+  "[ 13/8 → 7/4 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:0.5 ]",
+  "[ 7/4 → 15/8 | note:a# s:sawtooth delay:0.8 delaytime:0.5 delayspeed:0.5 ]",
+  "[ 15/8 → 2/1 | note:a s:sawtooth delay:0.8 delaytime:0.5 delayspeed:0.5 ]",
+  "[ 2/1 → 17/8 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-1 ]",
+  "[ 17/8 → 9/4 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-1 ]",
+  "[ 9/4 → 19/8 | note:a# s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-1 ]",
+  "[ 19/8 → 5/2 | note:a s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-1 ]",
+  "[ 5/2 → 21/8 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-1 ]",
+  "[ 21/8 → 11/4 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-1 ]",
+  "[ 11/4 → 23/8 | note:a# s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-1 ]",
+  "[ 23/8 → 3/1 | note:a s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-1 ]",
+  "[ 3/1 → 25/8 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-2 ]",
+  "[ 25/8 → 13/4 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-2 ]",
+  "[ 13/4 → 27/8 | note:a# s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-2 ]",
+  "[ 27/8 → 7/2 | note:a s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-2 ]",
+  "[ 7/2 → 29/8 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-2 ]",
+  "[ 29/8 → 15/4 | note:d s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-2 ]",
+  "[ 15/4 → 31/8 | note:a# s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-2 ]",
+  "[ 31/8 → 4/1 | note:a s:sawtooth delay:0.8 delaytime:0.5 delayspeed:-2 ]",
+]
+`;
+
 exports[`runs examples > example "delaytime" example index 0 1`] = `
 [
   "[ 0/1 → 1/2 | s:bd delay:0.25 delaytime:0.125 ]",

From 5632d83afb124d679be292890a49ffd31b34e690 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Wed, 16 Jul 2025 02:21:39 +0200
Subject: [PATCH 52/52] fix: supradough onTrigger after breaking change

---
 packages/webaudio/supradough.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webaudio/supradough.mjs b/packages/webaudio/supradough.mjs
index 10664aa89..f97251a07 100644
--- a/packages/webaudio/supradough.mjs
+++ b/packages/webaudio/supradough.mjs
@@ -20,7 +20,7 @@ const soundMap = new Map();
 const loadedSounds = new Map();
 
 Pattern.prototype.supradough = function () {
-  return this.onTrigger((_, hap, __, cps, begin) => {
+  return this.onTrigger((hap, __, cps, begin) => {
     hap.value._begin = begin;
     hap.value._duration = hap.duration / cps;
     !doughWorklet && initDoughWorklet();