fix first pattern muted case

CONTRIBUTING.md

@@ -52,17 +52,7 @@ Strudel is a project handmade by humans, with thought and nuance.
 
 If you have used LLMs (so called 'AI'), please detail that in the pull request. We are still developing our response to the onslaught of LLM technology, but for practical and legal reasons are currently not accepting wholly LLM-generated code. We are also not accepting PRs that add LLM features to strudel itself.
 
-There are #llm-chat and #llm-share channels on [our discord](https://discord.com/invite/HGEdXmRkzT). Please do not discuss or share LLM-related things outside of those channels.
+There are #llm-chat and #llm-share channels on our discord. Please do not discuss or share LLM-related things outside of those channels.
-
-## Creating and sharing a new project using strudel
-
-Strudel is free/open source software, and we are also happy to see people making use of it within the following terms. 
-
-Please don't use 'strudel' in the name of your project, so people don't assume it's official strudel project. (If you'd like it to be an official strudel project, please check in with the community, e.g. on [the discord](https://discord.com/invite/HGEdXmRkzT).) 
-
-Please respect our AGPL license, which e.g. requires you to share/link to the source code of strudel, any modifications you've made to it, and the source code for the rest of your project if it integrates with strudel. You are also required to maintain Strudel's copyright notices in the source code, and include Strudel's copyright notice in your user interface. This is an ad-hoc summary - please [refer to the license](https://codeberg.org/uzu/strudel/src/branch/main/LICENSE) for full details.
-
-You are also encouraged to connect with the community and understand our aims and values.
 
 ## Report a Bug
 

packages/core/controls.mjs

@@ -2352,18 +2352,11 @@ export const { offset } = registerControl('offset');
  **/
 export const { octaves } = registerControl('octaves');
 /**
- *  How the voicing is aligned to the anchor
+ * Remove anchor note from the voicing. Useful for melody harmonization
- *   - `below`: top note <= anchor
- *   - `duck`: top note <= anchor, anchor excluded
- *   - `above`: bottom note >= anchor
- *   - `root`: bottom note is the lowest root of the chord >= anchor
- *
- *   - `oldabove` : old (buggy) behavior of above, kept for legacy reason
- *   - `oldroot` : old (buggy) behavior of root, kept for legacy reason
  *
  * @name mode
  * @tags tonal
- * @param {string | Pattern} modeName one of {below | above | duck | root | oldabove | oldroot}
+ * @param {string | Pattern} modeName one of {below | above | duck | root}
  * @example
  * mode("<below above duck root>").chord("C").voicing()
  *

packages/core/cyclist.mjs

@@ -10,7 +10,7 @@ import { errorLogger, logger } from './logger.mjs';
 export class Cyclist {
   constructor({
     interval,
-    onSchedule,
+    onTrigger,
     onToggle,
     onError,
     getTime,
@@ -63,7 +63,12 @@ export class Cyclist {
             if (hap.hasOnset()) {
               const targetTime =
                 (hap.whole.begin - this.num_cycles_at_cps_change) / this.cps + this.seconds_at_cps_change + latency;
-              onSchedule?.(hap, targetTime, this.cps);
+              const duration = hap.duration / this.cps;
+              // the following line is dumb and only here for backwards compatibility
+              // see https://codeberg.org/uzu/strudel/pulls/1004
+              const deadline = targetTime - phase;
+              // this onTrigger has another signature
+              onTrigger?.(hap, deadline, duration, this.cps, targetTime);
               if (hap.value.cps !== undefined && this.cps != hap.value.cps) {
                 this.cps = hap.value.cps;
                 this.num_ticks_since_cps_change = 0;

packages/core/neocyclist.mjs

@@ -8,7 +8,7 @@ import { logger } from './logger.mjs';
 import { ClockCollator, cycleToSeconds } from './util.mjs';
 
 export class NeoCyclist {
-  constructor({ onSchedule, onToggle, getTime }) {
+  constructor({ onTrigger, onToggle, getTime }) {
     this.started = false;
     this.cps = 0.5;
     this.getTime = getTime; // get absolute time
@@ -43,7 +43,8 @@ export class NeoCyclist {
         if (hap.hasOnset()) {
           const timeUntilTrigger = cycleToSeconds(hap.whole.begin - this.cycle, this.cps);
           const targetTime = timeUntilTrigger + currentTime + this.latency;
-          onSchedule?.(hap, targetTime, this.cps);
+          const duration = cycleToSeconds(hap.duration, this.cps);
+          onTrigger?.(hap, 0, duration, this.cps, targetTime);
         }
       });
     };

packages/core/pattern.mjs

@@ -27,7 +27,6 @@ import {
 import drawLine from './drawLine.mjs';
 import { errorLogger, logger } from './logger.mjs';
 import { strudelScope } from './evaluate.mjs';
-import { getTime } from './schedulerState.mjs';
 
 let stringParser;
 
@@ -873,41 +872,23 @@ export class Pattern {
   //////////////////////////////////////////////////////////////////////
   // Context methods - ones that deal with metadata
 
-  /**
+  onTrigger(onTrigger, dominant = true) {
-   * Attaches a function that is called for each hap onset.
-   * @name onSchedule
-   * @memberof Pattern
-   * @example
-   * s("bd sd").onSchedule((hap, time, cps) => {
-   *   console.log('hap scheduled', time, cps);
-   * })
-   */
-  onSchedule(onSchedule, dominant = true) {
     return this.withHap((hap) =>
       hap.setContext({
         ...hap.context,
-        onSchedule: (scheduleHap, t, cps) => {
+        onTrigger: (...args) => {
           // run previously set trigger, if it exists
-          hap.context.onSchedule?.(scheduleHap, t, cps);
+          hap.context.onTrigger?.(...args);
-          onSchedule(scheduleHap, t, cps);
+          onTrigger(...args);
         },
-        // if dominantScheduler is set to true, the default output (webaudio) will be disabled
+        // if dominantTrigger is set to true, the default output (webaudio) will be disabled
         // when using multiple triggers, you cannot flip this flag to false again!
         // example: x.csound('CooLSynth').log() as well as x.log().csound('CooLSynth') should work the same
-        dominantScheduler: hap.context.dominantScheduler || dominant,
+        dominantTrigger: hap.context.dominantTrigger || dominant,
       }),
     );
   }
 
-  // legacy:
-  onTrigger(onTrigger, dominant = true) {
-    console.warn('onTrigger is deprecated.. use onSchedule(hap, time, cps) instead');
-    return this.onSchedule((hap, t, cps) => {
-      const currentTime = getTime();
-      return onTrigger(hap, currentTime, cps, t);
-    }, dominant);
-  }
-
   /**
    * Writes the content of the current event to the console (visible in the side menu).
    * @tags visualization
@@ -917,7 +898,7 @@ export class Pattern {
    * s("bd sd").log()
    */
   log(func = (hap) => `[hap] ${hap.showWhole(true)}`, getData = (hap) => ({ hap })) {
-    return this.onSchedule((...args) => {
+    return this.onTrigger((...args) => {
       logger(func(...args), undefined, getData(...args));
     }, false);
   }
@@ -1021,7 +1002,7 @@ export const arpWith = register('arpWith', (func, pat) => {
  * */
 export const arp = register(
   'arp',
-  (indices, pat) => pat.arpWith((haps) => reify(indices).fmap((i) => haps[_mod(i, haps.length)])),
+  (indices, pat) => pat.arpWith((haps) => reify(indices).fmap((i) => haps[i % haps.length])),
   false,
 );
 
@@ -1476,6 +1457,27 @@ export function stack(...pats) {
   return result;
 }
 
+
+/**
+ * The given items are played at the same time at the same length.
+ *
+ * @tags temporal
+ * @return {Pattern}
+ * @synonyms polyrhythm, pr
+ * @example
+ * mute_stack("g3", "b3", ["e4", "d4"]).note()
+ * // "g3,b3,[e4 d4]".note()
+ *
+ * @example
+ * // As a chained function:
+ * s("hh*4").mute_stack(
+ *   note("c4(5,8)")
+ * )
+ */
+export function mute_stack(...pats) {
+  return silence;
+}
+
 function _stackWith(func, pats) {
   pats = pats.map((pat) => (Array.isArray(pat) ? sequence(...pat) : reify(pat)));
   if (pats.length === 0) {
@@ -1548,9 +1550,7 @@ export function slowcat(...pats) {
   // Array test here is to avoid infinite recursions..
   pats = pats.map((pat) => (Array.isArray(pat) ? fastcat(...pat) : reify(pat)));
 
-  if (!pats.length) {
+  if (pats.length == 1) {
-    return silence;
-  } else if (pats.length == 1) {
     return pats[0];
   }
 
@@ -1558,6 +1558,10 @@ export function slowcat(...pats) {
     const span = state.span;
     const pat_n = _mod(span.begin.sam(), pats.length);
     const pat = pats[pat_n];
+    if (!pat) {
+      // pat_n can be negative, if the span is in the past..
+      return [];
+    }
     // A bit of maths to make sure that cycles from constituent patterns aren't skipped.
     // For example if three patterns are slowcat-ed, the fourth cycle of the result should
     // be the second (rather than fourth) cycle from the first pattern.
@@ -1574,14 +1578,11 @@ export function slowcat(...pats) {
  * @return {Pattern}
  */
 export function slowcatPrime(...pats) {
-  if (!pats.length) {
-    return silence;
-  }
   pats = pats.map(reify);
   const query = function (state) {
-    const pat_n = _mod(Math.floor(state.span.begin), pats.length);
+    const pat_n = Math.floor(state.span.begin) % pats.length;
-    const pat = pats[pat_n];
+    const pat = pats[pat_n]; // can be undefined for same cases e.g. /#cHVyZSg0MikKICAuZXZlcnkoMyxhZGQoNykpCiAgLmxhdGUoLjUp
-    return pat.query(state);
+    return pat?.query(state) || [];
   };
   return new Pattern(query).splitQueries();
 }
@@ -3654,6 +3655,26 @@ export const slice = register(
   false, // turns off auto-patternification
 );
 
+/**
+ *
+ * make something happen on event time
+ * uses browser timeout which is innacurate for audio tasks
+ * @name onTriggerTime
+ * @tags external_io
+ * @memberof Pattern
+ *  @returns Pattern
+ * @example
+ * s("bd!8").onTriggerTime((hap) => {console.log(hap)})
+ */
+Pattern.prototype.onTriggerTime = function (func) {
+  return this.onTrigger((hap, currentTime, _cps, targetTime) => {
+    const diff = targetTime - currentTime;
+    window.setTimeout(() => {
+      func(hap);
+    }, diff * 1000);
+  }, false);
+};
+
 /**
  * Works the same as slice, but changes the playback speed of each slice to match the duration of its step.
  * @name splice

packages/core/repl.mjs

@@ -7,7 +7,7 @@ import {
   setIsStarted,
   setPattern as exposeSchedulerPattern,
   setTime,
-  setSchedulerFunc,
+  setTriggerFunc,
 } from './schedulerState.mjs';
 import { evalScope } from './evaluate.mjs';
 import { register, Pattern, isPattern, silence, stack } from './pattern.mjs';
@@ -55,7 +55,7 @@ export function repl({
   };
 
   const schedulerOptions = {
-    onSchedule: getScheduler({ defaultOutput }),
+    onTrigger: getTrigger({ defaultOutput, getTime }),
     getTime,
     onToggle: (started) => {
       updateState({ started });
@@ -73,7 +73,7 @@ export function repl({
   // NeoCyclist uses a shared worker to communicate between instances, which is not supported on mobile chrome
   const scheduler =
     sync && typeof SharedWorker != 'undefined' ? new NeoCyclist(schedulerOptions) : new Cyclist(schedulerOptions);
-  setSchedulerFunc(schedulerOptions.onSchedule);
+  setTriggerFunc(schedulerOptions.onTrigger);
   setCpsFunc(() => scheduler.cps);
   let pPatterns = {};
   let anonymousIndex = 0;
@@ -560,17 +560,20 @@ export function repl({
   return { scheduler, evaluate, evaluateBlock, start, stop, pause, setCps, setPattern, setCode, toggle, state };
 }
 
-export const getScheduler =
+export const getTrigger =
-  ({ defaultOutput }) =>
+  ({ getTime, defaultOutput }) =>
-  async (hap, t, cps) => {
+  async (hap, deadline, duration, cps, t) => {
+    //   ^ this signature is different from hap.context.onTrigger, as set by Pattern.onTrigger(onTrigger)
+    // TODO: get rid of deadline after https://codeberg.org/uzu/strudel/pulls/1004
     try {
-      if (!hap.context.onSchedule || !hap.context.dominantScheduler) {
+      if (!hap.context.onTrigger || !hap.context.dominantTrigger) {
-        await defaultOutput(hap, t, cps);
+        await defaultOutput(hap, deadline, duration, cps, t);
       }
-      if (hap.context.onSchedule) {
+      if (hap.context.onTrigger) {
-        await hap.context.onSchedule(hap, t, cps);
+        // call signature of output / onTrigger is different...
+        await hap.context.onTrigger(hap, getTime(), cps, t);
       }
     } catch (err) {
-      errorLogger(err, 'getScheduler');
+      errorLogger(err, 'getTrigger');
     }
   };

packages/core/schedulerState.mjs

@@ -7,7 +7,7 @@ This program is free software: you can redistribute it and/or modify it under th
 let time;
 let cpsFunc;
 let pattern;
-let schedulerFunc;
+let triggerFunc;
 let isStarted;
 export function getTime() {
   if (!time) {
@@ -36,12 +36,12 @@ export function getPattern() {
   return pattern;
 }
 
-export function setSchedulerFunc(func) {
+export function setTriggerFunc(func) {
-  schedulerFunc = func;
+  triggerFunc = func;
 }
 
-export function getSchedulerFunc() {
+export function getTriggerFunc() {
-  return schedulerFunc;
+  return triggerFunc;
 }
 
 export function setIsStarted(val) {

packages/core/signal.mjs

@@ -6,7 +6,6 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import { Hap } from './hap.mjs';
 import { Pattern, fastcat, pure, register, reify, silence, stack, sequenceP } from './pattern.mjs';
-import { _mod } from './util.mjs';
 import Fraction from './fraction.mjs';
 
 import { id, keyAlias, getCurrentKeyboardState } from './util.mjs';
@@ -34,7 +33,7 @@ export const signal = (func) => {
  * .scale('C major')
  *
  */
-export const saw = signal((t) => _mod(t, 1));
+export const saw = signal((t) => t % 1);
 
 /**
  *  A sawtooth signal between -1 and 1 (like `saw`, but bipolar).
@@ -57,7 +56,7 @@ export const saw2 = saw.toBipolar();
  * .scale('C major')
  *
  */
-export const isaw = signal((t) => 1 - _mod(t, 1));
+export const isaw = signal((t) => 1 - (t % 1));
 
 /**
  *  A sawtooth signal between 1 and -1 (like `saw2`, but flipped).
@@ -114,7 +113,7 @@ export const cosine2 = sine2._early(Fraction(1).div(4));
  * n(square.segment(4).range(0,7)).scale("C:minor")
  *
  */
-export const square = signal((t) => Math.floor(_mod(t * 2, 2)));
+export const square = signal((t) => Math.floor((t * 2) % 2));
 
 /**
  *  A square signal between -1 and 1 (like `square`, but bipolar).
@@ -124,22 +123,6 @@ export const square = signal((t) => Math.floor(_mod(t * 2, 2)));
  */
 export const square2 = square.toBipolar();
 
-/**
- *  A square signal between 1 and 0 (like `square` but flipped).
- *
- * @return {Pattern}
- * @tags generators
- */
-export const isquare = signal((t) => 1 - Math.floor(_mod(t * 2, 2)));
-
-/**
- *  A square signal between 1 and -1 (like `isquare`, but bipolar).
- *
- * @return {Pattern}
- * @tags generators
- */
-export const isquare2 = isquare.toBipolar();
-
 /**
  *  A triangle signal between 0 and 1.
  *
@@ -413,7 +396,7 @@ export const randrun = (n) => {
       .map((n, i) => [n, i])
       .sort((a, b) => (a[0] > b[0]) - (a[0] < b[0]))
       .map((x) => x[1]);
-    const i = _mod(t.cyclePos().mul(n).floor(), n);
+    const i = t.cyclePos().mul(n).floor() % n;
     return nums[i];
   })._segment(n);
 };

packages/core/speak.mjs

@@ -32,7 +32,7 @@ function triggerSpeech(words, lang, voice) {
 }
 
 export const speak = register('speak', function (lang, voice, pat) {
-  return pat.onSchedule((hap) => {
+  return pat.onTrigger((hap) => {
     triggerSpeech(hap.value, lang, voice);
   });
 });

packages/core/test/pattern.test.mjs

@@ -18,7 +18,6 @@ import {
   fastcat,
   firstOf,
   slowcat,
-  slowcatPrime,
   cat,
   sequence,
   palindrome,
@@ -46,7 +45,6 @@ import {
   rev,
   time,
   run,
-  randrun,
   binaryN,
   pick,
   stackLeft,
@@ -55,7 +53,6 @@ import {
   stepcat,
   sometimes,
   expand,
-  arp,
 } from '../index.mjs';
 
 import { log, logValues } from '../pattern.mjs';
@@ -547,9 +544,6 @@ describe('Pattern', () => {
     });
   });
   describe('slowcat()', () => {
-    it('Can be empty', () => {
-      expect(slowcat().firstCycle()).toStrictEqual([]);
-    });
     it('Can concatenate things slowly', () => {
       expect(
         slowcat('a', 'b')
@@ -582,38 +576,6 @@ describe('Pattern', () => {
       sameFirst(slowcat('a', ['b', 'c']).fast(4), sequence('a', ['b', 'c']).fast(2));
     });
   });
-  describe('slowcatPrime()', () => {
-    it('Can be empty', () => {
-      expect(slowcatPrime().firstCycle()).toStrictEqual([]);
-    });
-    it('Can slowcat patterns swapping back and forth skipping the expected notes', () => {
-      expect(
-        slowcatPrime(fastcat(0, 1, 2, 3).slow(2), fastcat(4, 5, 6, 7).slow(2))
-          .fast(4)
-          .firstCycle()
-          .map((a) => a.value),
-      ).toStrictEqual([0, 1, 6, 7, 0, 1, 6, 7]);
-    });
-    it('Can go into negative time', () => {
-      expect(
-        slowcatPrime(fastcat(0, 1, 2, 3).slow(2), fastcat(4, 5, 6, 7).slow(2))
-          .fast(4)
-          .late(8)
-          .firstCycle()
-          .map((a) => a.value),
-      ).toStrictEqual([0, 1, 6, 7, 0, 1, 6, 7]);
-    });
-  });
-  describe('arp()', () => {
-    it('It wraps around with both positive and negative indices', () => {
-      expect(
-        stack('a', 'b', 'c')
-          .arp(fastcat(-3, -2, -1, 0, 1, 2, 3, 4))
-          .firstCycle()
-          .map((a) => a.value),
-      ).toStrictEqual(['a', 'b', 'c', 'a', 'b', 'c', 'a', 'b']);
-    });
-  });
   describe('rev()', () => {
     it('Can reverse things', () => {
       expect(
@@ -983,17 +945,6 @@ describe('Pattern', () => {
     it('Can run', () => {
       expect(run(4).firstCycle()).toStrictEqual(sequence(0, 1, 2, 3).firstCycle());
     });
-    it('Can go into negative time', () => {
-      expect(run(4).late(1).firstCycle()).toStrictEqual(sequence(0, 1, 2, 3).firstCycle());
-    });
-  });
-  describe('randrun', () => {
-    it('Can randrun', () => {
-      expect(randrun(4).firstCycle()).toStrictEqual(sequence(2, 1, 3, 0).firstCycle());
-    });
-    it('Can go into negative time', () => {
-      expect(randrun(4).late(1).firstCycle()).toStrictEqual(sequence(1, 2, 0, 3).firstCycle());
-    });
   });
   describe('binaryN', () => {
     it('Can make a binary pattern from a decimal', () => {
@@ -1363,7 +1314,7 @@ describe('Pattern', () => {
 
       // Force a trigger
       haps.forEach((hap) => {
-        hap.context?.onSchedule?.(hap);
+        hap.context?.onTrigger?.(hap);
       });
 
       expect(mockConsoleLog).toHaveBeenCalledWith(
@@ -1381,7 +1332,7 @@ describe('Pattern', () => {
 
       // Force a trigger
       haps.forEach((hap) => {
-        hap.context?.onSchedule?.(hap);
+        hap.context?.onTrigger?.(hap);
       });
 
       expect(mockConsoleLog).toHaveBeenCalledWith(

packages/core/test/signal.test.mjs

@@ -8,23 +8,7 @@ import Fraction from 'fraction.js';
 
 import { describe, it, expect, vi } from 'vitest';
 
-import {
+import { saw, saw2, isaw, isaw2, per, perx, cyclesPer } from '../signal.mjs';
-  saw,
-  saw2,
-  isaw,
-  isaw2,
-  tri,
-  tri2,
-  itri,
-  itri2,
-  square,
-  square2,
-  isquare,
-  isquare2,
-  per,
-  perx,
-  cyclesPer,
-} from '../signal.mjs';
 import { fastcat, sequence, State, TimeSpan, Hap, note } from '../index.mjs';
 
 const st = (begin, end) => new State(ts(begin, end));
@@ -40,61 +24,17 @@ const sameFirst = (a, b) => {
 
 describe('signal()', () => {
   it('Can make saw/saw2', () => {
-    expect(saw.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(0, 0.25, 0.5, 0.75).firstCycle());
+    expect(saw.struct(true, true, true, true).firstCycle()).toStrictEqual(
+      sequence(0, 1 / 4, 1 / 2, 3 / 4).firstCycle(),
+    );
+
     expect(saw2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(-1, -0.5, 0, 0.5).firstCycle());
   });
   it('Can make isaw/isaw2', () => {
     expect(isaw.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.75, 0.5, 0.25).firstCycle());
+
     expect(isaw2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.5, 0, -0.5).firstCycle());
   });
-  it('Can make tri/tri2', () => {
-    expect(tri.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(0, 0.5, 1, 0.5).firstCycle());
-    expect(tri2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(-1, 0, 1, 0).firstCycle());
-  });
-  it('Can make itri/itri2', () => {
-    expect(itri.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.5, 0, 0.5).firstCycle());
-    expect(itri2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0, -1, 0).firstCycle());
-  });
-  it('Can make square/square2', () => {
-    expect(square.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(0, 0, 1, 1).firstCycle());
-    expect(square2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(-1, -1, 1, 1).firstCycle());
-  });
-  it('Can make isquare/isquare2', () => {
-    expect(isquare.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 1, 0, 0).firstCycle());
-    expect(isquare2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 1, -1, -1).firstCycle());
-  });
-  it('Can go into negative time', () => {
-    expect(saw.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(0, 0.25, 0.5, 0.75).firstCycle(),
-    );
-    expect(saw2.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(-1, -0.5, 0, 0.5).firstCycle(),
-    );
-    expect(isaw.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(1, 0.75, 0.5, 0.25).firstCycle(),
-    );
-    expect(isaw2.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(1, 0.5, 0, -0.5).firstCycle(),
-    );
-    expect(tri.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(0, 0.5, 1, 0.5).firstCycle(),
-    );
-    expect(tri2.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(-1, 0, 1, 0).firstCycle());
-    expect(itri.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(1, 0.5, 0, 0.5).firstCycle(),
-    );
-    expect(itri2.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0, -1, 0).firstCycle());
-    expect(square.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(0, 0, 1, 1).firstCycle());
-    expect(square2.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(-1, -1, 1, 1).firstCycle(),
-    );
-    expect(isquare.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(1, 1, 0, 0).firstCycle(),
-    );
-    expect(isquare2.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(1, 1, -1, -1).firstCycle(),
-    );
-  });
 });
 
 describe('cyclesPer', () => {

packages/core/util.mjs

@@ -137,7 +137,7 @@ export const getFrequency = (hap) => {
     if (value.freq) {
       return value.freq;
     }
-    return getFreq(value.note ?? value.n ?? value.value);
+    return getFreq(value.note || value.n || value.value);
   }
   if (typeof value === 'number' && context.type !== 'frequency') {
     value = midiToFreq(hap.value);

packages/csound/index.mjs

@@ -23,7 +23,7 @@ export const csound = register('csound', (instrument, pat) => {
   instrument = instrument || 'triangle';
   init(); // not async to support csound inside other patterns + to be able to call pattern methods after it
   // TODO: find a alternative way to wait for csound to load (to wait with first time playback)
-  return pat.onSchedule((hap, targetTime) => {
+  return pat.onTrigger((hap, currentTime, _cps, targetTime) => {
     if (!_csound) {
       logger('[csound] not loaded yet', 'warning');
       return;
@@ -36,10 +36,9 @@ export const csound = register('csound', (instrument, pat) => {
     const controls = Object.entries({ ...hap.value, freq })
       .flat()
       .join('/');
-
     // TODO: find out how to send a precise ctx based time
     // http://www.csounds.com/manual/html/i.html
-    const timeOffset = targetTime - getAudioContext().currentTime; // latency ?
+    const timeOffset = targetTime - currentTime; // latency ?
     //const timeOffset = time_deprecate - getAudioContext().currentTime
     const params = [
       `"${instrument}"`, // p1: instrument name
@@ -145,7 +144,7 @@ export const csoundm = register('csoundm', (instrument, pat) => {
     p1 = `"${instrument}"`;
   }
   init(); // not async to support csound inside other patterns + to be able to call pattern methods after it
-  return pat.onSchedule((hap, targetTime) => {
+  return pat.onTrigger((hap, currentTime, _cps, targetTime) => {
     if (!_csound) {
       logger('[csound] not loaded yet', 'warning');
       return;
@@ -153,7 +152,6 @@ export const csoundm = register('csoundm', (instrument, pat) => {
     if (typeof hap.value !== 'object') {
       throw new Error('csound only support objects as hap values');
     }
-    const currentTime = getAudioContext().currentTime;
     // Time in seconds counting from now.
     const p2 = targetTime - currentTime;
     const p3 = hap.duration.valueOf() + 0;

packages/desktopbridge/midibridge.mjs

@@ -1,4 +1,3 @@
-import { getAudioContext } from '@strudel/webaudio/index.mjs';
 import { Invoke } from './utils.mjs';
 import { Pattern, getEventOffsetMs, noteToMidi } from '@strudel/core';
 
@@ -7,8 +6,7 @@ const OFF_MESSAGE = 0x80;
 const CC_MESSAGE = 0xb0;
 
 Pattern.prototype.midi = function (output) {
-  return this.onSchedule((hap, targetTime, cps) => {
+  return this.onTrigger((hap, currentTime, cps, targetTime) => {
-    const currentTime = getAudioContext().currentTime;
     let { note, nrpnn, nrpv, ccn, ccv, velocity = 0.9, gain = 1 } = hap.value;
     //magic number to get audio engine to line up, can probably be calculated somehow
     const latencyMs = 34;

packages/desktopbridge/oscbridge.mjs

@@ -1,14 +1,12 @@
 import { Pattern, ClockCollator } from '@strudel/core';
-import { parseControlsFromHap } from '@strudel/osc/osc.mjs';
+import { parseControlsFromHap } from 'node_modules/@strudel/osc/osc.mjs';
 import { Invoke } from './utils.mjs';
-import { getAudioContext } from '@strudel/webaudio/index.mjs';
 
 const collator = new ClockCollator({});
 
-export async function oscSchedulerTauri(hap, targetTime, cps = 1) {
+export async function oscTriggerTauri(hap, currentTime, cps = 1, targetTime) {
   const controls = parseControlsFromHap(hap, cps);
   const params = [];
-  const currentTime = getAudioContext().currentTime;
   const timestamp = collator.calculateTimestamp(currentTime, targetTime);
 
   Object.keys(controls).forEach((key) => {
@@ -34,5 +32,5 @@ export async function oscSchedulerTauri(hap, targetTime, cps = 1) {
   });
 }
 Pattern.prototype.osc = function () {
-  return this.onSchedule(oscSchedulerTauri);
+  return this.onTrigger(oscTriggerTauri);
 };

packages/desktopbridge/package.json

@@ -23,7 +23,6 @@
   },
   "dependencies": {
     "@strudel/core": "workspace:*",
-    "@strudel/webaudio": "workspace:*",
     "@tauri-apps/api": "^2.2.0"
   },
   "homepage": "https://codeberg.org/uzu/strudel#readme",

packages/dough/dough.mjs

@@ -1,75 +0,0 @@
-/*
-dough.mjs
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/osc/osc.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { register, noteToMidi } from '@strudel/core';
-import { Dough, doughsamples } from 'dough-synth';
-import { getAudioContext, ensureMinimalOutput } from '@strudel/webaudio';
-import wasm from 'dough-synth/dough.wasm?url';
-import workletCode from 'dough-synth/dough.js?raw';
-
-Object.assign(globalThis, { doughsamples });
-
-let D;
-/**
- *
- * initializes dough ahead of time. you don't need to use this, but if you do, you can await it, so dough is ready before the pattern starts.
- *
- * @name initDough
- * @tags external_io
- * @memberof Pattern
- * @example
- * await initDough()
- * $: chord("<Dm9 Dm11 Dm7>").offset("<-1 0 1 0>").voicing()
- * .phaser(3).fm(1.4).fmh(1.01)
- * .dough()
- */
-export function initDough() {
-  if (!D || D.audioContext !== getAudioContext()) {
-    D = new Dough({
-      wasm,
-      workletCode,
-      audioContext: getAudioContext(),
-    });
-  }
-  return D.ready;
-}
-
-export async function doughScheduler(hap, targetTime, cps = 1) {
-  const offset = D.context_offset?.[0];
-  if (!offset) {
-    return; // not ready
-  }
-  hap.ensureObjectValue();
-  const event = {
-    dough: 'play',
-    ...hap.value,
-    time: targetTime - offset,
-    duration: hap.duration / cps,
-  };
-  if (typeof event.note === 'string') {
-    event.note = noteToMidi(event.note);
-  }
-  D.evaluate(event);
-}
-
-/**
- *
- * Uses dough as the audio engine. more info at https://dough.strudel.cc
- *
- * @name dough
- * @tags external_io
- * @memberof Pattern
- * @returns Pattern
- * @example
- * $: chord("<Dm9 Dm11 Dm7>").offset("<-1 0 1 0>").voicing()
- * .phaser(3).fm(1.4).fmh(1.01)
- * .dough()
- */
-export const dough = register('dough', (pat) => {
-  initDough();
-  ensureMinimalOutput();
-  return pat.onSchedule(doughScheduler);
-});

packages/dough/package.json

@@ -1,42 +0,0 @@
-{
-  "name": "@strudel/dough",
-  "version": "1.3.2",
-  "description": "dough synth integration for strudel",
-  "main": "dough.mjs",
-  "type": "module",
-  "publishConfig": {
-    "main": "dist/index.mjs"
-  },
-  "scripts": {
-    "build": "vite build",
-    "prepublishOnly": "npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
-  },
-  "keywords": [
-    "tidalcycles",
-    "strudel",
-    "pattern",
-    "livecoding",
-    "algorave"
-  ],
-  "author": "Felix Roos <flix91@gmail.com>",
-  "license": "AGPL-3.0-or-later",
-  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
-  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
-  "dependencies": {
-    "@strudel/core": "workspace:*",
-    "@strudel/webaudio": "workspace:*",
-    "dough-synth": "0.2.4"
-  },
-  "devDependencies": {
-    "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  }
-}

packages/midi/midi.mjs

@@ -13,7 +13,7 @@ import {
   getIsStarted,
   getPattern,
   getTime,
-  getSchedulerFunc,
+  getTriggerFunc,
   isPattern,
   logger,
   ref,
@@ -21,8 +21,8 @@ import {
 } from '@strudel/core';
 import { noteToMidi, getControlName } from '@strudel/core';
 import { Note } from 'webmidi';
-import { getAudioContext, getClockBridge } from '@strudel/webaudio';
+import { getAudioContext } from '@strudel/webaudio';
-import { scheduleAtTime, ensureMinimalOutput } from '../superdough/helpers.mjs';
+import { scheduleAtTime } from '../superdough/helpers.mjs';
 import { getMidiDeviceNamesString, getDevice } from './util.mjs';
 import { MidiInput } from './input.mjs';
 
@@ -171,23 +171,6 @@ function normalize(value = 0, min = 0, max = 1, exp = 1) {
   return Math.pow(normalized, exp);
 }
 
-const isFirefox = navigator?.userAgent?.includes('Firefox');
-// call fn either directly with given time (non-firefox) or after scheduleAtTime with undefined (firefox)
-// the scheduleAtTime approach is still jittery, but the best we can be on firefox
-// firefox bug: https://bugzilla.mozilla.org/show_bug.cgi?id=2062997
-function timedSend(timeMs, fn) {
-  if (isFirefox) {
-    const audioTime = getClockBridge().getAudioContextTime(timeMs);
-    if (!audioTime) {
-      logger('[midi]: skip event, not ready');
-      return;
-    }
-    scheduleAtTime(() => fn(undefined), audioTime);
-  } else {
-    fn(timeMs);
-  }
-}
-
 function mapCC(mapping, value) {
   return Object.keys(value)
     .filter((key) => !!mapping[getControlName(key)])
@@ -199,7 +182,7 @@ function mapCC(mapping, value) {
 }
 
 // sends a cc message to the given device on the given channel
-function sendCC(ccn, ccv, device, midichan, timeMs) {
+function sendCC(ccn, ccv, device, midichan, targetTime) {
   if (typeof ccv !== 'number' || ccv < 0 || ccv > 1) {
     throw new Error('expected ccv to be a number between 0 and 1');
   }
@@ -207,19 +190,23 @@ function sendCC(ccn, ccv, device, midichan, timeMs) {
     throw new Error('expected ccn to be a number or a string');
   }
   const scaled = Math.round(ccv * 127);
-  timedSend(timeMs, (timeMs) => device.sendControlChange(ccn, scaled, { channels: midichan, time: timeMs }));
+  scheduleAtTime(() => {
+    device.sendControlChange(ccn, scaled, midichan);
+  }, targetTime);
 }
 
 // sends a program change message to the given device on the given channel
-function sendProgramChange(progNum, device, midichan, timeMs) {
+function sendProgramChange(progNum, device, midichan, targetTime) {
   if (typeof progNum !== 'number' || progNum < 0 || progNum > 127) {
     throw new Error('expected progNum (program change) to be a number between 0 and 127');
   }
-  timedSend(timeMs, (timeMs) => device.sendProgramChange(progNum, { channels: midichan, time: timeMs }));
+  scheduleAtTime(() => {
+    device.sendProgramChange(progNum, midichan);
+  }, targetTime);
 }
 
 // sends a sysex message to the given device on the given channel
-function sendSysex(sysexid, sysexdata, device, timeMs) {
+function sendSysex(sysexid, sysexdata, device, targetTime) {
   if (Array.isArray(sysexid)) {
     if (!sysexid.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
       throw new Error('all sysexid bytes must be integers between 0 and 255');
@@ -234,11 +221,13 @@ function sendSysex(sysexid, sysexdata, device, timeMs) {
   if (!sysexdata.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
     throw new Error('all sysex bytes must be integers between 0 and 255');
   }
-  timedSend(timeMs, (timeMs) => device.sendSysex(sysexid, sysexdata, { time: timeMs }));
+  scheduleAtTime(() => {
+    device.sendSysex(sysexid, sysexdata);
+  }, targetTime);
 }
 
 // sends a NRPN message to the given device on the given channel
-function sendNRPN(nrpnn, nrpv, device, midichan, timeMs) {
+function sendNRPN(nrpnn, nrpv, device, midichan, targetTime) {
   if (Array.isArray(nrpnn)) {
     if (!nrpnn.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
       throw new Error('all nrpnn bytes must be integers between 0 and 255');
@@ -246,29 +235,34 @@ function sendNRPN(nrpnn, nrpv, device, midichan, timeMs) {
   } else if (!Number.isInteger(nrpv) || nrpv < 0 || nrpv > 255) {
     throw new Error('A:sysexid must be an number between 0 and 255 or an array of such integers');
   }
-
+  scheduleAtTime(() => {
-  timedSend(timeMs, (timeMs) => device.sendNrpnValue(nrpnn, nrpv, { channels: midichan, time: timeMs }));
+    device.sendNRPN(nrpnn, nrpv, midichan);
+  }, targetTime);
 }
 
 // sends a pitch bend message to the given device on the given channel
-function sendPitchBend(midibend, device, midichan, timeMs) {
+function sendPitchBend(midibend, device, midichan, targetTime) {
   if (typeof midibend !== 'number' || midibend < -1 || midibend > 1) {
     throw new Error('expected midibend to be a number between -1 and 1');
   }
-  timedSend(timeMs, (timeMs) => device.sendPitchBend(midibend, { channels: midichan, time: timeMs }));
+  scheduleAtTime(() => {
+    device.sendPitchBend(midibend, midichan);
+  }, targetTime);
 }
 
 // sends a channel aftertouch message to the given device on the given channel
-function sendAftertouch(miditouch, device, midichan, timeMs) {
+function sendAftertouch(miditouch, device, midichan, targetTime) {
   if (typeof miditouch !== 'number' || miditouch < 0 || miditouch > 1) {
     throw new Error('expected miditouch to be a number between 0 and 1');
   }
 
-  timedSend(timeMs, (timeMs) => device.sendChannelAftertouch(miditouch, { channels: midichan, time: timeMs }));
+  scheduleAtTime(() => {
+    device.sendChannelAftertouch(miditouch, midichan);
+  }, targetTime);
 }
 
 // sends a note message to the given device on the given channel
-function sendNote(note, velocity, duration, device, midichan, timeMs) {
+function sendNote(note, velocity, duration, device, midichan, targetTime) {
   if (note == null || note === '') {
     throw new Error('note cannot be null or empty');
   }
@@ -279,10 +273,11 @@ function sendNote(note, velocity, duration, device, midichan, timeMs) {
     throw new Error('duration must be a positive number');
   }
   const midiNumber = typeof note === 'number' ? note : noteToMidi(note);
-  const midiNote = new Note(midiNumber, { attack: velocity });
+  const midiNote = new Note(midiNumber, { attack: velocity, duration });
 
-  timedSend(timeMs, (timeMs) => device.sendNoteOn(midiNote, { channels: midichan, time: timeMs }));
+  scheduleAtTime(() => {
-  timedSend(timeMs + duration, (timeMs) => device.sendNoteOff(midiNote, { channels: midichan, time: timeMs }));
+    device.playNote(midiNote, midichan);
+  }, targetTime);
 }
 
 /**
@@ -292,6 +287,8 @@ function sendNote(note, velocity, duration, device, midichan, timeMs) {
  * @param {object} options Additional MIDI configuration options
  * @example
  * note("c4").midichan(1).midi('IAC Driver Bus 1')
+ * @example
+ * note("c4").midichan(1).midi('IAC Driver Bus 1', { controller: true, latency: 50 })
  */
 
 Pattern.prototype.midi = function (midiport, options = {}) {
@@ -317,7 +314,7 @@ Pattern.prototype.midi = function (midiport, options = {}) {
   let midiConfig = {
     // Default configuration values
     isController: false, // Disable sending notes for midi controllers
-    noteOffsetMs: isFirefox ? 10 : 1, // Default note-off offset to prevent glitching in ms. firefox needs more slack
+    noteOffsetMs: 10, // Default note-off offset to prevent glitching in ms
     midichannel: 1, // Default MIDI channel
     velocity: 0.9, // Default velocity
     gain: 1, // Default gain
@@ -340,19 +337,11 @@ Pattern.prototype.midi = function (midiport, options = {}) {
       logger(`Midi device disconnected! Available: ${getMidiDeviceNamesString(outputs)}`),
   });
 
-  ensureMinimalOutput();
+  return this.onTrigger((hap, _currentTime, cps, targetTime) => {
-
-  return this.sortHapsByPart().onSchedule((hap, targetTime, cps) => {
     if (!WebMidi.enabled) {
       logger('Midi not enabled');
       return;
     }
-    const timeMs = getClockBridge().getPerformanceTime(targetTime);
-    if (!timeMs) {
-      logger('[midi] clockbridge not ready');
-      return;
-    }
-
     hap.ensureObjectValue();
 
     // midi event values from hap with configurable defaults
@@ -390,7 +379,7 @@ Pattern.prototype.midi = function (midiport, options = {}) {
     // if midimap is set, send a cc messages from defined controls
     if (midicontrolMap.has(midimap)) {
       const ccs = mapCC(midicontrolMap.get(midimap), hap.value);
-      ccs.forEach(({ ccn, ccv }) => sendCC(ccn, ccv, device, midichan, timeMs));
+      ccs.forEach(({ ccn, ccv }) => sendCC(ccn, ccv, device, midichan, targetTime));
     } else if (midimap !== 'default') {
       // Add warning when a non-existent midimap is specified
       logger(`[midi] midimap "${midimap}" not found! Available maps: ${[...midicontrolMap.keys()].join(', ')}`);
@@ -398,20 +387,16 @@ Pattern.prototype.midi = function (midiport, options = {}) {
 
     // Handle note
     if (note !== undefined && !midiConfig.isController) {
-      // note off time is calculated early, together with note on time
+      // note off messages will often a few ms arrive late,
-      // when the note off is due, the clock might have drifted, and the next note on message might happen before the note off
+      // try to prevent glitching by subtracting noteOffsetMs from the duration length
-      // this would lead to the next note being cut off
+      const duration = (hap.duration.valueOf() / cps) * 1000 - midiConfig.noteOffsetMs;
-      // this is why we make notes shorter by noteOffsetMs, so note offs happen earlier than the note ons after
-      const hapDuration = (hap.duration.valueOf() / cps) * 1000;
-      const offset = Math.min(midiConfig.noteOffsetMs, hapDuration / 2);
-      const duration = hapDuration - offset;
 
-      sendNote(note, velocity, duration, device, midichan, timeMs);
+      sendNote(note, velocity, duration, device, midichan, targetTime);
     }
 
     // Handle program change
     if (progNum !== undefined) {
-      sendProgramChange(progNum, device, midichan, timeMs);
+      sendProgramChange(progNum, device, midichan, targetTime);
     }
 
     // Handle sysex
@@ -421,53 +406,63 @@ Pattern.prototype.midi = function (midiport, options = {}) {
     // if sysexid is an array the first byte is 0x00
 
     if (sysexid !== undefined && sysexdata !== undefined) {
-      sendSysex(sysexid, sysexdata, device, timeMs);
+      sendSysex(sysexid, sysexdata, device, targetTime);
     }
 
     // Handle control change
     if (ccv !== undefined && ccn !== undefined) {
-      sendCC(ccn, ccv, device, midichan, timeMs);
+      sendCC(ccn, ccv, device, midichan, targetTime);
     }
 
     // Handle NRPN non-registered parameter number
     if (nrpnn !== undefined && nrpv !== undefined) {
-      sendNRPN(nrpnn, nrpv, device, midichan, timeMs);
+      sendNRPN(nrpnn, nrpv, device, midichan, targetTime);
     }
 
     // Handle midibend
     if (midibend !== undefined) {
-      sendPitchBend(midibend, device, midichan, timeMs);
+      sendPitchBend(midibend, device, midichan, targetTime);
     }
 
     // Handle miditouch
     if (miditouch !== undefined) {
-      sendAftertouch(miditouch, device, midichan, timeMs);
+      sendAftertouch(miditouch, device, midichan, targetTime);
     }
 
     // Handle midicmd
     if (hap.whole.begin + 0 === 0) {
       // we need to start here because we have the timing info
-      timedSend(timeMs, (timeMs) => device.sendStart({ time: timeMs }));
+      scheduleAtTime(() => {
+        device.sendStart();
+      }, targetTime);
     }
     if (['clock', 'midiClock'].includes(midicmd)) {
-      timedSend(timeMs, (timeMs) => device.sendClock({ time: timeMs }));
+      scheduleAtTime(() => {
+        device.sendClock();
+      }, targetTime);
     } else if (['start'].includes(midicmd)) {
-      timedSend(timeMs, (timeMs) => device.sendStart({ time: timeMs }));
+      scheduleAtTime(() => {
+        device.sendStart();
+      }, targetTime);
     } else if (['stop'].includes(midicmd)) {
-      timedSend(timeMs, (timeMs) => device.sendStop({ time: timeMs }));
+      scheduleAtTime(() => {
+        device.sendStop();
+      }, targetTime);
     } else if (['continue'].includes(midicmd)) {
-      timedSend(timeMs, (timeMs) => device.sendContinue({ time: timeMs }));
+      scheduleAtTime(() => {
+        device.sendContinue();
+      }, targetTime);
     } else if (Array.isArray(midicmd)) {
       if (midicmd[0] === 'progNum') {
-        sendProgramChange(midicmd[1], device, midichan, timeMs);
+        sendProgramChange(midicmd[1], device, midichan, targetTime);
       } else if (midicmd[0] === 'cc') {
         if (midicmd.length === 2) {
-          sendCC(midicmd[0], midicmd[1] / 127, device, midichan, timeMs);
+          sendCC(midicmd[0], midicmd[1] / 127, device, midichan, targetTime);
         }
       } else if (midicmd[0] === 'sysex') {
         if (midicmd.length === 3) {
           const [_, id, data] = midicmd;
-          sendSysex(id, data, device, timeMs);
+          sendSysex(id, data, device, targetTime);
         }
       }
     }
@@ -570,8 +565,8 @@ const kListeners = {};
 
 function _triggerKeyboard(input, cps, now, latencyCycles) {
   const pattern = getPattern();
-  const schedule = getSchedulerFunc();
+  const trigger = getTriggerFunc();
-  if (!pattern || !schedule) {
+  if (!pattern || !trigger) {
     return false;
   }
   const t = now + latencyCycles;
@@ -588,7 +583,8 @@ function _triggerKeyboard(input, cps, now, latencyCycles) {
       return;
     }
     const t = ctxNow + (hap.whole.begin - now) / cps;
-    schedule(hap, t, cps);
+    const duration = hap.duration / cps;
+    trigger(hap, t - ctxNow, duration, cps, t);
   });
 
   return true;
@@ -623,7 +619,7 @@ export async function midikeys(input) {
     noteoff ||= noteon && velocity === 0; // handle devices which may use velocity = 0 to signal noteoff
     const key = `${input}_${note}`;
     const cps = getCps() ?? 0.5;
-    const triggerAvailable = !!(getPattern() && getSchedulerFunc());
+    const triggerAvailable = !!(getPattern() && getTriggerFunc());
     const latencySeconds = triggerAvailable ? 0.01 : 0.06; // avoid missing notes due to cyclist / trigger latency
     const now = getTime();
     const t = now + latencySeconds * cps;

packages/mondo/mondo.mjs

@@ -5,6 +5,12 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 // evolved from https://garten.salat.dev/lisp/parser.html
+
+let recurse = 0
+function lrec(...args) {
+  recurse += 1
+  console.info(recurse, ...args)
+}
 export class MondoParser {
   // these are the tokens we expect
   token_types = {
@@ -24,10 +30,17 @@ export class MondoParser {
     op: /^[*/:!@%?+\-&]|^\.{2}/, // * / : ! @ % ? ..
     // dollar: /^\$/,
     pipe: /^#/,
-    stack: /^[,$]/,
+    // Matches _$ or _$BASS
+    mute_stack: /^_\$([a-zA-Z0-9_]+)?/,
+    // Matches S$ or S$VOCALS
+    solo_stack: /^S\$([a-zA-Z0-9_]+)?/,
+    // stack: /^[,$]/,
+    stack: /^,|^\$([a-zA-Z0-9_]+)?/,
     or: /^[|]/,
     plain: /^[a-zA-Z0-9-~_^#]+/,
+
   };
+  solo_enabled = false;
   op_precedence = [['*', '/', ':', '!', '@', '%', '?', '+', '-', '..'], ['&']];
   // matches next token
   next_token(code, offset = 0) {
@@ -62,6 +75,7 @@ export class MondoParser {
       offset += token.value.length;
       tokens.push(token);
     }
+    lrec("TOKENS", tokens[0], tokens[1])
     return tokens;
   }
   // take code, return abstract syntax tree
@@ -73,19 +87,22 @@ export class MondoParser {
     while (this.tokens.length) {
       expressions.push(this.parse_expr());
     }
+    let parsed = expressions[0]
     if (expressions.length === 0) {
       // empty case
-      return { type: 'list', children: [] };
+      parsed = { type: 'list', children: [] };
-    }
+    } else if (expressions.length > 1 || expressions[0].type !== 'list')
     // do we have multiple top level expressions or a single non list?
-    if (expressions.length > 1 || expressions[0].type !== 'list') {
+    {
-      return {
+      parsed = {
         type: 'list',
         children: this.desugar(expressions),
       };
     }
+
+    lrec("PARSED", parsed)
     // we have a single list
-    return expressions[0];
+    return parsed;
   }
   // parses any valid expression
   parse_expr() {
@@ -120,8 +137,11 @@ export class MondoParser {
       children = children.slice(splitIndex + 1);
     }
     chunks.push(children);
+    lrec("chunks", chunks)
     return chunks;
   }
+
+  
   desugar_split(children, split_type, next) {
     const chunks = this.split_children(children, split_type);
     if (chunks.length === 1) {
@@ -253,12 +273,15 @@ export class MondoParser {
     }
     return node;
   }
+
   desugar(children, type) {
     // if type is given, the first element is expected to contain it as plain value
     // e.g. with (square a b, c), we want to split (a b, c) and ignore "square"
     children = type ? children.slice(1) : children;
-    children = this.desugar_split(children, 'stack', (children) =>
+
-      this.desugar_split(children, 'or', (children) => {
+    const desugar_split_children = (children) => {
+      return this.desugar_split(children, 'or', (children) => {
+        console.info("TYPE", type)
         // chunks of multiple args
         if (type) {
           // the type we've removed before splitting needs to be added back
@@ -269,14 +292,34 @@ export class MondoParser {
           children = this.desugar_ops(children, ops);
         });
         children = this.desugar_pipes(children);
+        lrec("STACK CHILDREN", children)
         return children;
-      }),
+      })
-    );
+
+    }
+
+    console.info("PRE_CHILDREN", children)
+    // children = this.desugar_split(children, 'mute_stack', (children) => {
+    //   const x = desugar_split_children(children)
+    //   // lrec({x})
+    //   return x
+    // })
+
+    lrec({ children })
+
+
+    children = this.desugar_split(children, 'stack', (children) => {
+      return desugar_split_children(children)
+    })
+
+
+    lrec("CHILDREN", children)
     return children;
   }
   parse_list() {
     let node = this.parse_pair('open_list', 'close_list');
     node.children = this.desugar(node.children);
+    lrec("node", node)
     return node;
   }
   parse_angle() {
@@ -325,9 +368,8 @@ export function printAst(ast, compact = false, lvl = 0) {
   const br = compact ? '' : '\n';
   const spaces = compact ? '' : Array(lvl).fill(' ').join('');
   if (ast.type === 'list') {
-    return `${lvl ? br : ''}${spaces}(${ast.children.map((child) => printAst(child, compact, lvl + 1)).join(' ')}${
+    return `${lvl ? br : ''}${spaces}(${ast.children.map((child) => printAst(child, compact, lvl + 1)).join(' ')}${ast.children.find((child) => child.type === 'list') ? `${br}${spaces})` : ')'
-      ast.children.find((child) => child.type === 'list') ? `${br}${spaces})` : ')'
+      }`;
-    }`;
   }
   return `${ast.value}`;
 }

packages/mondough/mondough.mjs

@@ -49,10 +49,11 @@ lib['or'] = (...children) => chooseIn(...children); // always has structure but
 //lib['or'] = (...children) => chooseOut(...children); // "s oh*8.dec[.04 | .5]" is better but "dec[.04 | .5].s oh*8" has no struct
 
 function evaluator(node, scope) {
-  const { type } = node;
+  const { type,children } = node;
-  // node is list
+  // node is list]
-  if (type === 'list') {
+  if (type === 'list' && children.length) {
-    const { children } = node;
+    // const { children } = node;
+   
     const [name, ...args] = children;
     // some functions wont be reified to make sure they work (e.g. see extend below)
     if (typeof name === 'function') {
@@ -65,6 +66,7 @@ function evaluator(node, scope) {
     const first = name.firstCycle(true)[0];
     const type = typeof first?.value;
     if (type !== 'function') {
+      console.error("first", first)
       throw new Error(`[mondough] expected function, got "${first?.value}"`);
     }
     return name
@@ -76,12 +78,16 @@ function evaluator(node, scope) {
       })
       .innerJoin();
   }
+
+  console.info("NODE", node)
   // node is leaf
   let { value } = node;
   if (type === 'plain' && scope[value]) {
     return reify(scope[value]); // -> local scope has no location
   }
   const variable = lib[value] ?? strudelScope[value];
+
+  console.info("VARIABLE", variable)
   // problem: collisions when we want a string that happens to also be a variable name
   // example: "s sine" -> sine is also a variable
   let pat;
@@ -107,6 +113,7 @@ export function mondo(code, offset = 0) {
     code = code.join('');
   }
   const pat = runner.run(code, undefined, offset);
+  console.info("MONDO_PAT", pat)
   return pat.markcss('color: var(--caret,--foreground);text-decoration:underline');
 }
 

packages/mqtt/mqtt.mjs

@@ -4,7 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Pattern, getTime, createParams } from '@strudel/core';
+import { Pattern, isPattern, createParams } from '@strudel/core';
 import Paho from 'paho-mqtt';
 
 const connections = {};
@@ -80,39 +80,42 @@ Pattern.prototype.mqtt = function (
     }
     cx.connect(props);
   }
-  return this.onSchedule((hap, targetTime, cps) => {
+  return this.withHap((hap) => {
-    let msg_topic = topic;
+    const onTrigger = (hap, currentTime, cps, targetTime) => {
-    if (!cx || !cx.isConnected()) {
+      let msg_topic = topic;
-      return;
+      if (!cx || !cx.isConnected()) {
-    }
+        return;
-    let message = '';
+      }
-    if (typeof hap.value === 'object') {
+      let message = '';
-      let value = hap.value;
+      if (typeof hap.value === 'object') {
+        let value = hap.value;
 
-      // Try to take topic from pattern if it's not set
+        // Try to take topic from pattern if it's not set
-      if (typeof msg_topic === 'undefined' && 'topic' in value) {
+        if (typeof msg_topic === 'undefined' && 'topic' in value) {
-        msg_topic = value.topic;
+          msg_topic = value.topic;
-        if (Array.isArray(msg_topic)) {
+          if (Array.isArray(msg_topic)) {
-          msg_topic = msg_topic.join('/');
+            msg_topic = msg_topic.join('/');
+          }
+          msg_topic = '/' + msg_topic;
         }
-        msg_topic = '/' + msg_topic;
+        if (add_meta) {
+          const duration = hap.duration.div(cps);
+          value = { ...value, duration: duration.valueOf(), cps: cps };
+        }
+        message = JSON.stringify(value);
+      } else {
+        message = hap.value;
       }
-      if (add_meta) {
+      message = new Paho.Message(message);
-        const duration = hap.duration.div(cps);
+      message.destinationName = msg_topic;
-        value = { ...value, duration: duration.valueOf(), cps: cps };
-      }
-      message = JSON.stringify(value);
-    } else {
-      message = hap.value;
-    }
-    message = new Paho.Message(message);
-    message.destinationName = msg_topic;
 
-    const offset = (targetTime - getTime() + latency) * 1000;
+      const offset = (targetTime - currentTime + latency) * 1000;
 
-    window.setTimeout(function () {
+      window.setTimeout(function () {
-      cx.send(message);
+        cx.send(message);
-    }, offset);
+      }, offset);
+    };
+    return hap.setContext({ ...hap.context, onTrigger, dominantTrigger: true });
   });
 };
 

packages/osc/osc.mjs

@@ -4,8 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { logger, parseNumeral, register, isNote, noteToMidi } from '@strudel/core';
+import { logger, parseNumeral, register, isNote, noteToMidi, ClockCollator } from '@strudel/core';
-import { ensureMinimalOutput, getClockBridge } from '@strudel/webaudio';
 
 let connection; // Promise<OSC>
 function connect() {
@@ -46,6 +45,7 @@ export function parseControlsFromHap(hap, cps) {
       controls.midinote = parseNumeral(controls.note);
     }
   }
+  controls.bank && (controls.s = controls.bank + controls.s);
   controls.roomsize && (controls.size = parseNumeral(controls.roomsize));
   // speed adjustment for CPS is handled on the DSP side in superdirt and pattern side in Strudel,
   // so we need to undo the adjustment before sending the message to superdirt.
@@ -55,18 +55,13 @@ export function parseControlsFromHap(hap, cps) {
   return controls;
 }
 
-export async function oscScheduler(hap, targetTime, cps = 1) {
+const collator = new ClockCollator({});
+
+export async function oscTrigger(hap, currentTime, cps = 1, targetTime) {
   const ws = await connect();
-
-  const timeMs = getClockBridge().getPerformanceTime(targetTime);
-  if (!timeMs) {
-    logger('[osc] clockbridge not ready');
-    return;
-  }
-  const ts = performance.timeOrigin + timeMs;
-
   const controls = parseControlsFromHap(hap, cps);
   const keyvals = Object.entries(controls).flat();
+  const ts = collator.calculateTimestamp(currentTime, targetTime) * 1000;
   const msg = { address: '/dirt/play', args: keyvals, timestamp: ts };
 
   if ('oschost' in hap.value) {
@@ -88,7 +83,4 @@ export async function oscScheduler(hap, targetTime, cps = 1) {
  * @memberof Pattern
  * @returns Pattern
  */
-export const osc = register('osc', (pat) => {
+export const osc = register('osc', (pat) => pat.onTrigger(oscTrigger));
-  ensureMinimalOutput();
-  return pat.onSchedule(oscScheduler);
-});

packages/osc/package.json

@@ -38,7 +38,6 @@
   "homepage": "https://codeberg.org/uzu/strudel#readme",
   "dependencies": {
     "@strudel/core": "workspace:*",
-    "@strudel/webaudio": "workspace:*",
     "osc": "^2.4.5",
     "ws": "^8.18.3"
   },

packages/osc/superdirtoutput.js

@@ -1,7 +1,10 @@
 /* import { oscTriggerTauri } from '../desktopbridge/oscbridge.mjs';
 import { isTauri } from '../desktopbridge/utils.mjs'; */
-import { oscScheduler } from './osc.mjs';
+import { oscTrigger } from './osc.mjs';
 
-const scheduler = /* isTauri() ? oscTriggerTauri : */ oscScheduler;
+const trigger = /* isTauri() ? oscTriggerTauri : */ oscTrigger;
 
-export const superdirtOutput = (hap, targetTime, cps) => scheduler(hap, targetTime, cps);
+export const superdirtOutput = (hap, deadline, hapDuration, cps, targetTime) => {
+  const currentTime = performance.now() / 1000;
+  return trigger(hap, currentTime, cps, targetTime);
+};

packages/sampler/sample-server.mjs

@@ -98,7 +98,6 @@ if (args.includes('--json')) {
   }
   writeFileSync(outFile, json, 'utf8');
   console.log(`Wrote json to ${outFile}`);
-  process.exit(0);
 }
 
 console.log(

packages/serial/serial.mjs

@@ -4,7 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Pattern, getTime } from '@strudel/core';
+import { Pattern, isPattern } from '@strudel/core';
 
 var writeMessagers = {};
 var choosing = false;
@@ -64,50 +64,53 @@ function crc16(data) {
 }
 
 Pattern.prototype.serial = function (br = 115200, sendcrc = false, singlecharids = false, name = 'default') {
-  if (!(name in writeMessagers)) {
+  return this.withHap((hap) => {
-    getWriter(name, br);
+    if (!(name in writeMessagers)) {
-  }
+      getWriter(name, br);
-  return this.onSchedule((hap, targetTime) => {
+    }
-    var message = '';
+    const onTrigger = (hap, currentTime, _cps, targetTime) => {
-    var chk = 0;
+      var message = '';
-    if (typeof hap.value === 'object') {
+      var chk = 0;
-      if ('action' in hap.value) {
+      if (typeof hap.value === 'object') {
-        var action = hap.value['action'];
+        if ('action' in hap.value) {
-        if (singlecharids) {
+          var action = hap.value['action'];
-          action = action.charAt(0);
-        }
-        message += action + '(';
-        var first = true;
-        for (var [key, val] of Object.entries(hap.value)) {
-          if (key === 'action') {
-            continue;
-          }
-          if (first) {
-            first = false;
-          } else {
-            message += ',';
-          }
           if (singlecharids) {
-            key = key.charAt(0);
+            action = action.charAt(0);
+          }
+          message += action + '(';
+          var first = true;
+          for (var [key, val] of Object.entries(hap.value)) {
+            if (key === 'action') {
+              continue;
+            }
+            if (first) {
+              first = false;
+            } else {
+              message += ',';
+            }
+            if (singlecharids) {
+              key = key.charAt(0);
+            }
+            message += key + ':' + val;
+          }
+          message += ')';
+          if (sendcrc) {
+            chk = crc16(message);
+          }
+        } else {
+          for (const [key, val] of Object.entries(hap.value)) {
+            message += `${key}:${val}`;
           }
-          message += key + ':' + val;
-        }
-        message += ')';
-        if (sendcrc) {
-          chk = crc16(message);
         }
       } else {
-        for (const [key, val] of Object.entries(hap.value)) {
+        message = hap.value;
-          message += `${key}:${val}`;
-        }
       }
-    } else {
+      const offset = (targetTime - currentTime + latency) * 1000;
-      message = hap.value;
-    }
-    const offset = (targetTime - getTime() + latency) * 1000;
 
-    window.setTimeout(function () {
+      window.setTimeout(function () {
-      writeMessagers[name](message, chk);
+        writeMessagers[name](message, chk);
-    }, offset);
+      }, offset);
+    };
+    return hap.setContext({ ...hap.context, onTrigger, dominantTrigger: true });
   });
 };

packages/soundfonts/sfumato.mjs

@@ -3,7 +3,7 @@ import { getAudioContext, registerSound } from '@strudel/webaudio';
 import { loadSoundfont as _loadSoundfont, startPresetNote } from 'sfumato';
 
 Pattern.prototype.soundfont = function (sf, n = 0) {
-  return this.onSchedule((h, targetTime) => {
+  return this.onTrigger((h, ct, cps, targetTime) => {
     const ctx = getAudioContext();
     const note = getPlayableNoteValue(h);
     const preset = sf.presets[n % sf.presets.length];

packages/superdough/audioContext.mjs

@@ -7,24 +7,15 @@ Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { clearNodePool } from './nodePools.mjs';
+let audioContext;
-import { ClockBridge } from './clockbridge.mjs';
-
-let audioContext, clockBridge;
 
 export const setDefaultAudioContext = () => {
-  return setAudioContext(new AudioContext());
+  audioContext = new AudioContext();
+  return audioContext;
 };
 
 export const setAudioContext = (context) => {
-  // Existing nodes in the node pool contain references to the previous AudioContext,
-  // so all the nodes in the pool must be cleared when we set a new AudioContext.
-  clearNodePool();
-  if (audioContext && audioContext.state !== 'closed') {
-    audioContext.close();
-  }
   audioContext = context;
-  clockBridge = new ClockBridge(audioContext);
   return audioContext;
 };
 
@@ -36,13 +27,6 @@ export const getAudioContext = () => {
   return audioContext;
 };
 
-export function getClockBridge() {
-  if (!clockBridge) {
-    getAudioContext(); // creates clockBridge
-  }
-  return clockBridge;
-}
-
 export function getAudioContextCurrentTime() {
   return getAudioContext().currentTime;
 }

packages/superdough/clockbridge.mjs

@@ -1,41 +0,0 @@
-/*
-clockbridge.mjs
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/superdough/index.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-// thanks freya https://youtu.be/LSNQuFEDOyQ?si=ukZI2IGgWV_NDZzP&t=2979
-export function expDecay(a, b, decay, dt) {
-  return b + (a - b) * Math.exp(-decay * dt);
-}
-
-// translates between audio and performance clock
-export class ClockBridge {
-  p; // smoothed clock offset
-  lastTime;
-  audioContext;
-  constructor(audioContext) {
-    this.audioContext = audioContext;
-  }
-  // delta between audio and performance time in ms
-  getOffset() {
-    const { contextTime, performanceTime } = this.audioContext.getOutputTimestamp();
-    if (!contextTime || !performanceTime) {
-      return;
-    }
-    const offset = performanceTime - contextTime * 1000; // clock offset in ms
-    const dt = performanceTime - (this.lastTime ?? performanceTime); // delta time since last hap
-    const decay = 1 / 10000; // how fast offset changes have an effect
-    this.p = expDecay(this.p ?? offset, offset, decay, dt); // smooth clock offset
-    this.lastTime = performanceTime;
-    return this.p;
-  }
-  getPerformanceTime(audioContextTime) {
-    const offset = this.getOffset();
-    return audioContextTime * 1000 + offset; // this is now correct in performance time (ms)
-  }
-  getAudioContextTime(performanceTime) {
-    const offset = this.getOffset();
-    return (performanceTime - offset) / 1000; // this is now correct in audio context time (seconds)
-  }
-}

packages/superdough/dspworklet.mjs

@@ -67,14 +67,13 @@ if (typeof window !== 'undefined') {
   });
 }
 
-export const rawdsp = async (code) => {
+export const dough = async (code) => {
   const ac = getAudioContext();
   stop();
   worklet = await dspWorklet(ac, code);
   worklet.node.connect(ac.destination);
 };
 
-export function rawdspScheduler(hap, time, cps) {
+export function doughTrigger(hap, currentTime, cps, targetTime) {
-  const currentTime = getAudioContext().currentTime;
+  window.postMessage({ time: targetTime, dough: hap.value, currentTime, duration: hap.duration, cps });
-  window.postMessage({ time, dough: hap.value, currentTime, duration: hap.duration, cps });
 }

packages/superdough/helpers.mjs

@@ -6,27 +6,12 @@ import { clamp, nanFallback, midiToFreq, noteToMidi } from './util.mjs';
 
 export const noises = ['pink', 'white', 'brown', 'crackle'];
 
-export function gainNode(value, audioContext = getAudioContext()) {
+export function gainNode(value) {
-  const node = audioContext.createGain();
+  const node = getAudioContext().createGain();
   node.gain.value = value;
   return node;
 }
 
-// this helper makes sure the audio context is "used", meaning it outputs something
-// this prevents the browser from throttling timing accuracy
-// it happened when only midi was running, the clock got more drifty without this
-let constantNode, constantNodeAudioContext;
-export function ensureMinimalOutput() {
-  if (constantNode && constantNodeAudioContext === getAudioContext()) {
-    return;
-  }
-  constantNodeAudioContext = getAudioContext();
-  constantNode = new ConstantSourceNode(constantNodeAudioContext);
-  constantNode.offset.value = 1e-7;
-  constantNode.connect(constantNodeAudioContext.destination);
-  constantNode.start();
-}
-
 export function effectSend(input, effect, wet) {
   const send = gainNode(wet);
   input.connect(send);
@@ -389,7 +374,7 @@ export function webAudioTimeout(audioContext, onComplete, startTime, stopTime) {
 
   // Certain browsers requires audio nodes to be connected in order for their onended events
   // to fire, so we _mute it_ and then connect it to the destination
-  const zeroGain = gainNode(0, audioContext);
+  const zeroGain = gainNode(0);
   zeroGain.connect(audioContext.destination);
   constantNode.connect(zeroGain);
 

packages/superdough/index.mjs

@@ -14,4 +14,3 @@ export * from './modulators.mjs';
 export * from './dspworklet.mjs';
 export * from './audioContext.mjs';
 export * from './wavetable.mjs';
-export * from './clockbridge.mjs';

packages/superdough/nodePools.mjs

@@ -5,24 +5,11 @@ Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { releaseAudioNode } from './helpers.mjs';
-
 const nodePools = new Map();
 const POOL_KEY = Symbol('nodePoolKey');
 
 export const isPoolable = (node) => !!node[POOL_KEY];
 
-export const clearNodePool = () => {
-  for (const pool of nodePools) {
-    for (const node of pool) {
-      if (node instanceof AudioNode) {
-        releaseAudioNode(node);
-      }
-    }
-  }
-  nodePools.clear();
-};
-
 const getNodeTime = (node) => {
   return node.context?.currentTime ?? 0;
 };

packages/superdough/superdough.mjs

@@ -1048,3 +1048,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     }
   });
 };
+
+export const superdoughTrigger = (t, hap, ct, cps) => {
+  superdough(hap, t - ct, hap.duration / cps, cps);
+};

packages/tonal/tonal.mjs

@@ -137,14 +137,7 @@ export const { transpose, trans } = register(['transpose', 'trans'], function tr
     const interval = !isNaN(Number(intervalOrSemitones))
       ? Interval.fromSemitones(intervalOrSemitones)
       : String(intervalOrSemitones);
-
+    const targetNote = Note.transpose(note, interval);
-    let n = Note.get(note);
-    if (n.oct == undefined) {
-      n.oct = 3;
-      let n1 = Note.get(Note.transpose(n, interval));
-      n.oct = n1.oct == 3 ? undefined : 3;
-    }
-    const targetNote = Note.transpose(n, interval);
     if (typeof hap.value === 'object') {
       return hap.withValue(() => ({ ...hap.value, note: targetNote }));
     }

packages/tonal/tonleiter.mjs

@@ -134,16 +134,6 @@ let modeTarget = {
   duck: (v) => v.slice(-1)[0],
   above: (v) => v[0],
   root: (v) => v[0],
-  oldabove: (v) => v[0],
-  oldroot: (v) => v[0],
-};
-let modeMult = {
-  below: 1,
-  duck: 1,
-  above: -1,
-  root: -1,
-  oldabove: 1,
-  oldroot: 1,
 };
 
 export function renderVoicing({ chord, dictionary, offset = 0, n, mode = 'below', anchor = 'c5', octaves = 1 }) {
@@ -154,20 +144,19 @@ export function renderVoicing({ chord, dictionary, offset = 0, n, mode = 'below'
   const voicings = dictionary[symbol].map((voicing) =>
     (typeof voicing === 'string' ? voicing.split(' ') : voicing).map(step2semitones),
   );
-  const mult = modeMult[mode];
 
   let minDistance, bestIndex;
   // calculate distances up from voicing top notes
   let chromaDiffs = voicings.map((v, i) => {
     const targetStep = modeTarget[mode](v);
-    const diff = _mod((anchorChroma - targetStep - rootChroma) * mult, 12);
+    const diff = _mod(anchorChroma - targetStep - rootChroma, 12);
     if (minDistance === undefined || diff < minDistance) {
       minDistance = diff;
       bestIndex = i;
     }
-    return diff * mult;
+    return diff;
   });
-  if (mode === 'root' || mode === 'oldroot') {
+  if (mode === 'root') {
     bestIndex = 0;
   }
 

packages/tonal/voicings.mjs

@@ -185,9 +185,6 @@ export const rootNotes = register('rootNotes', function (octave, pat) {
  *   - `below`: top note <= anchor
  *   - `duck`: top note <= anchor, anchor excluded
  *   - `above`: bottom note >= anchor
- *   - `root`: bottom note is the lowest root of the chord >= anchor
- *   - `oldabove` : old (buggy) behavior of above, kept for legacy reason
- *   - `oldroot` : old (buggy) behavior of root, kept for legacy reason
  * - `offset`: whole number that shifts the voicing up or down to the next voicing
  * - `n`: if set, the voicing is played like a scale. Overshooting numbers will be octaved
  *

packages/webaudio/supradough.mjs

@@ -20,7 +20,7 @@ const soundMap = new Map();
 const loadedSounds = new Map();
 
 Pattern.prototype.supradough = function () {
-  return this.onSchedule((hap, begin, cps) => {
+  return this.onTrigger((hap, __, cps, begin) => {
     hap.value._begin = begin;
     hap.value._duration = hap.duration / cps;
     !doughWorklet && initDoughWorklet();
@@ -114,11 +114,11 @@ async function fetchSample(url) {
   return { channels, sampleRate: buffer.sampleRate };
 }
 
-export async function supradoughsamples(sampleMap, baseUrl) {
+export async function doughsamples(sampleMap, baseUrl) {
   if (typeof sampleMap === 'string') {
     const [json, base] = await fetchSampleMap(sampleMap);
     // console.log('json', json, 'base', base);
-    return supradoughsamples(json, base);
+    return doughsamples(json, base);
   }
   Object.entries(sampleMap).map(async ([key, urls]) => {
     if (key !== '_base') {

packages/webaudio/webaudio.mjs

@@ -9,7 +9,7 @@ import {
   superdough,
   getAudioContext,
   setLogger,
-  rawdspScheduler,
+  doughTrigger,
   registerWorklet,
   setAudioContext,
   initAudio,
@@ -33,8 +33,7 @@ const hap2value = (hap) => {
 
 // uses more precise, absolute t if available, see https://github.com/tidalcycles/strudel/pull/1004
 // TODO: refactor output callbacks to eliminate deadline
-export const webaudioOutput = (hap, t, cps) => {
+export const webaudioOutput = (hap, _deadline, hapDuration, cps, t) => {
-  const hapDuration = hap.duration / cps;
   return superdough(hap2value(hap), t, hapDuration, cps, hap.whole?.begin.valueOf());
 };
 
@@ -57,14 +56,32 @@ export async function renderPatternAudio(
     maxPolyphony,
     multiChannelOrbits,
   });
+  logger('[webaudio] preloading');
 
-  // Firefox currently doesn't support suspending an OfflineAudioContext,
+  // Calling superdough(...) in ascending onset time order is important
-  // so no chunked rendering. Bad performance, but at least it works.
+  // for controls that depend on the audio graph state like `cut`
-  return (
+  let haps = pattern
-    audioContext.suspend === undefined
+    .queryArc(begin, end, { _cps: cps })
-      ? renderPatternAudioWhole(audioContext, pattern, cps, begin, end)
+    .sort((a, b) => a.whole.begin.valueOf() - b.whole.begin.valueOf());
-      : renderPatternAudioInChunks(audioContext, pattern, cps, begin, end, 1)
+  for (const hap of haps) {
-  )
+    if (hap.hasOnset()) {
+      try {
+        await superdough(
+          hap2value(hap),
+          (hap.whole.begin.valueOf() - begin) / cps,
+          hap.duration / cps,
+          cps,
+          (hap.whole?.begin.valueOf() - begin) / cps,
+        );
+      } catch (err) {
+        errorLogger(err, 'webaudio');
+      }
+    }
+  }
+  logger('[webaudio] start rendering');
+
+  return audioContext
+    .startRendering()
     .then((renderedBuffer) => {
       const wavBuffer = audioBufferToWav(renderedBuffer);
       const blob = new Blob([wavBuffer], { type: 'audio/wav' });
@@ -85,84 +102,6 @@ export async function renderPatternAudio(
     });
 }
 
-async function renderPatternAudioWhole(audioContext, pattern, cps, begin, end) {
-  logger(`[webaudio] preloading`);
-
-  await scheduleHapsChunk(pattern, cps, begin, begin, end);
-
-  logger('[webaudio] start rendering');
-
-  return audioContext.startRendering();
-}
-
-async function renderPatternAudioInChunks(audioContext, pattern, cps, begin, end, chunkSizeInCycles) {
-  let currentCycle = begin;
-  let renderPromise = null;
-
-  logger('[webaudio] start rendering');
-
-  while (currentCycle <= end) {
-    const chunkStart = currentCycle;
-    const chunkEnd = Math.min(currentCycle + chunkSizeInCycles, end);
-
-    logger(`[webaudio] preloading cycles ${chunkStart} - ${chunkEnd}`);
-
-    await scheduleHapsChunk(pattern, cps, begin, chunkStart, chunkEnd);
-
-    logger(`[webaudio] rendering cycles ${chunkStart} - ${chunkEnd}`);
-
-    currentCycle += chunkSizeInCycles;
-
-    // According to the MDN docs, suspends should be scheduled while
-    // the audioContext is not currently running for better precision.
-    // So we schedule the suspend first, and await after resuming.
-    var suspendPromise;
-    if (currentCycle < end) {
-      // Make sure to suspend one cycle before the next currentCycle
-      // so the next haps can be scheduled on time.
-      suspendPromise = audioContext.suspend((currentCycle - begin - 1) / cps);
-    }
-
-    if (renderPromise === null) {
-      renderPromise = audioContext.startRendering();
-    } else {
-      await audioContext.resume();
-    }
-
-    if (currentCycle < end) {
-      await suspendPromise;
-    }
-  }
-
-  logger('[webaudio] finish rendering');
-
-  return renderPromise;
-}
-
-async function scheduleHapsChunk(pattern, cps, begin, chunkStart, chunkEnd) {
-  // Calling superdough(...) in ascending onset time order is important
-  // for controls that depend on the audio graph state like `cut`
-  let haps = pattern
-    .queryArc(chunkStart, chunkEnd, { _cps: cps })
-    .sort((a, b) => a.whole.begin.valueOf() - b.whole.begin.valueOf());
-
-  for (const hap of haps) {
-    if (hap.hasOnset()) {
-      try {
-        await superdough(
-          hap2value(hap),
-          (hap.whole.begin.valueOf() - begin) / cps,
-          hap.duration / cps,
-          cps,
-          (hap.whole?.begin.valueOf() - begin) / cps,
-        );
-      } catch (err) {
-        errorLogger(err, 'webaudio');
-      }
-    }
-  }
-}
-
 export function webaudioRepl(options = {}) {
   const audioContext = options.audioContext ?? getAudioContext();
   setAudioContext(audioContext);
@@ -174,8 +113,8 @@ export function webaudioRepl(options = {}) {
   return repl(options);
 }
 
-Pattern.prototype.rawdsp = function () {
+Pattern.prototype.dough = function () {
-  return this.onSchedule(rawdspScheduler, 1);
+  return this.onTrigger(doughTrigger, 1);
 };
 
 function audioBufferToWav(buffer, opt) {
@@ -272,23 +211,3 @@ function writeString(view, offset, string) {
     view.setUint8(offset + i, string.charCodeAt(i));
   }
 }
-
-/**
- *
- * make something happen on event time
- * uses browser timeout which is innacurate for audio tasks
- * @name onTriggerTime
- * @tags external_io
- * @memberof Pattern
- *  @returns Pattern
- * @example
- * s("bd!8").onTriggerTime((hap) => {console.log(hap)})
- */
-Pattern.prototype.onTriggerTime = function (func) {
-  return this.onSchedule((hap, targetTime) => {
-    const diff = targetTime - getAudioContext().currentTime;
-    window.setTimeout(() => {
-      func(hap);
-    }, diff * 1000);
-  }, false);
-};

pnpm-lock.yaml

@@ -303,22 +303,6 @@ importers:
         specifier: ^2.2.0
         version: 2.2.0
 
-  packages/dough:
-    dependencies:
-      '@strudel/core':
-        specifier: workspace:*
-        version: link:../core
-      '@strudel/webaudio':
-        specifier: workspace:*
-        version: link:../webaudio
-      dough-synth:
-        specifier: 0.2.4
-        version: 0.2.4
-    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)
-
   packages/draw:
     dependencies:
       '@strudel/core':
@@ -486,9 +470,6 @@ importers:
       '@strudel/core':
         specifier: workspace:*
         version: link:../core
-      '@strudel/webaudio':
-        specifier: workspace:*
-        version: link:../webaudio
       osc:
         specifier: ^2.4.5
         version: 2.4.5
@@ -827,9 +808,6 @@ importers:
       '@strudel/desktopbridge':
         specifier: workspace:*
         version: link:../packages/desktopbridge
-      '@strudel/dough':
-        specifier: workspace:*
-        version: link:../packages/dough
       '@strudel/draw':
         specifier: workspace:*
         version: link:../packages/draw
@@ -2088,7 +2066,6 @@ packages:
   '@lerna/create@8.1.9':
     resolution: {integrity: sha512-DPnl5lPX4v49eVxEbJnAizrpMdMTBz1qykZrAbBul9rfgk531v8oAt+Pm6O/rpAleRombNM7FJb5rYGzBJatOQ==}
     engines: {node: '>=18.0.0'}
-    deprecated: This package is an implementation detail of Lerna and is no longer published separately.
 
   '@lezer/common@1.2.3':
     resolution: {integrity: sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==}
@@ -3088,7 +3065,6 @@ packages:
 
   '@ungap/structured-clone@1.3.0':
     resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
-    deprecated: Potential CWE-502 - Update to 1.3.1 or higher
 
   '@vite-pwa/astro@0.5.0':
     resolution: {integrity: sha512-Yd3Pug/c1EUQJXWvzYh6eTtoqzmSKcdCqWCcNquZeaD13tLWpBb2FIPJ4HMULVY6+GfxMvrT+OBuMrbHQCvftw==}
@@ -3740,7 +3716,6 @@ packages:
   conventional-changelog-core@5.0.1:
     resolution: {integrity: sha512-Rvi5pH+LvgsqGwZPZ3Cq/tz4ty7mjijhr3qR4m9IBXNbxGGYgTVVO+duXzz9aArmHxFtwZ+LRkrNIMDQzgoY4A==}
     engines: {node: '>=14'}
-    deprecated: Deprecated and no longer maintained. Please use conventional-changelog instead.
 
   conventional-changelog-preset-loader@3.0.0:
     resolution: {integrity: sha512-qy9XbdSLmVnwnvzEisjxdDiLA4OmV3o8db+Zdg4WiFw14fP3B6XNz98X0swPPpkTd/pc1K7+adKgEDM1JCUMiA==}
@@ -4072,10 +4047,6 @@ packages:
     resolution: {integrity: sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==}
     engines: {node: '>=12'}
 
-  dough-synth@0.2.4:
-    resolution: {integrity: sha512-qMnMKVj1B2ivUgobNCwqJqNzZHOMN+5339OmCOk07zIDEK7iCYdufa+ZDE2BEgmKrWDyhGS7oTNFjHtTwzEv9w==}
-    hasBin: true
-
   dset@3.1.4:
     resolution: {integrity: sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==}
     engines: {node: '>=4'}
@@ -4608,7 +4579,6 @@ packages:
   git-raw-commits@3.0.0:
     resolution: {integrity: sha512-b5OHmZ3vAgGrDn/X0kS+9qCfNKWe4K/jFnhwzVWWg0/k5eLa3060tZShrRg8Dja5kPc+YjS0Gc6y7cRr44Lpjw==}
     engines: {node: '>=14'}
-    deprecated: Deprecated and no longer maintained. Use @conventional-changelog/git-client instead.
     hasBin: true
 
   git-remote-origin-url@2.0.0:
@@ -4618,7 +4588,6 @@ packages:
   git-semver-tags@5.0.1:
     resolution: {integrity: sha512-hIvOeZwRbQ+7YEUmCkHqo8FOLQZCEn18yevLHADlFPZY02KJGsu5FZt9YW/lybfK2uhWFI7Qg/07LekJiTv7iA==}
     engines: {node: '>=14'}
-    deprecated: Deprecated and no longer maintained. Use @conventional-changelog/git-client instead.
     hasBin: true
 
   git-up@7.0.0:
@@ -4646,17 +4615,15 @@ packages:
 
   glob@10.4.5:
     resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
     hasBin: true
 
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
+    deprecated: Glob versions prior to v9 are no longer supported
 
   glob@9.3.5:
     resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==}
     engines: {node: '>=16 || 14 >=14.17'}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
 
   globalize@0.1.1:
     resolution: {integrity: sha512-5e01v8eLGfuQSOvx2MsDMOWS0GFtCx1wPzQSmcHw4hkxFzrQDBO3Xwg/m8Hr/7qXMrHeOIE29qWVzyv06u1TZA==}
@@ -6439,7 +6406,6 @@ packages:
   prebuild-install@7.1.1:
     resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==}
     engines: {node: '>=10'}
-    deprecated: No longer maintained. Please contact the author of the relevant native addon; alternatives are available.
     hasBin: true
 
   precinct@12.1.2:
@@ -7264,7 +7230,6 @@ packages:
   tar@6.2.1:
     resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
     engines: {node: '>=10'}
-    deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
 
   temp-dir@1.0.0:
     resolution: {integrity: sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==}
@@ -7392,7 +7357,6 @@ packages:
   tsconfck@3.1.4:
     resolution: {integrity: sha512-kdqWFGVJqe+KGYvlSO9NIaWn9jT1Ny4oKVzAJsKii5eoE9snzTJzL4+MMVOMn+fikWGFmKEylcXL710V/kIPJQ==}
     engines: {node: ^18 || >=20}
-    deprecated: unmaintained
     hasBin: true
     peerDependencies:
       typescript: ^5.0.0
@@ -7672,7 +7636,6 @@ packages:
 
   uuid@10.0.0:
     resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
-    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   validate-npm-package-license@3.0.4:
@@ -11794,8 +11757,6 @@ snapshots:
 
   dotenv@16.4.7: {}
 
-  dough-synth@0.2.4: {}
-
   dset@3.1.4: {}
 
   dunder-proto@1.0.1:

test/__snapshots__/examples.test.mjs.snap

@@ -639,30 +639,30 @@ exports[`runs examples > example "K" example index 0 1`] = `
   "[ 7/4 → 11/6 | note:C5 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[16 0.1 1 0.2 0.013] ]",
   "[ 11/6 → 23/12 | note:Eb4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[16 0.1 1 0.2 0.013] ]",
   "[ 23/12 → 2/1 | note:G4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[16 0.1 1 0.2 0.013] ]",
-  "[ 2/1 → 25/12 | note:Db5 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.03] ]",
+  "[ 2/1 → 25/12 | note:Db4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.03] ]",
   "[ 25/12 → 13/6 | note:F4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.03] ]",
   "[ 13/6 → 9/4 | note:Ab4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.03] ]",
-  "[ 9/4 → 7/3 | note:Db5 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.2 0.08] ]",
+  "[ 9/4 → 7/3 | note:Db4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.2 0.08] ]",
   "[ (7/3 → 19/8) ⇝ 29/12 | note:F4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.2 0.08] ]",
   "[ 7/3 ⇜ (19/8 → 29/12) | note:F4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.2 0.01] ]",
   "[ 29/12 → 5/2 | note:Ab4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.2 0.01] ]",
-  "[ 5/2 → 31/12 | note:Db5 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.01] ]",
+  "[ 5/2 → 31/12 | note:Db4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.01] ]",
   "[ 31/12 → 8/3 | note:F4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.01] ]",
   "[ 8/3 → 11/4 | note:Ab4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.01] ]",
-  "[ 11/4 → 17/6 | note:Db5 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[16 0.1 1 0.2 0.013] ]",
+  "[ 11/4 → 17/6 | note:Db4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[16 0.1 1 0.2 0.013] ]",
   "[ 17/6 → 35/12 | note:F4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[16 0.1 1 0.2 0.013] ]",
   "[ 35/12 → 3/1 | note:Ab4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[16 0.1 1 0.2 0.013] ]",
-  "[ 3/1 → 37/12 | note:Eb5 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.03] ]",
+  "[ 3/1 → 37/12 | note:Eb4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.03] ]",
   "[ 37/12 → 19/6 | note:G4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.03] ]",
   "[ 19/6 → 13/4 | note:Bb4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.03] ]",
-  "[ 13/4 → 10/3 | note:Eb5 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.2 0.08] ]",
+  "[ 13/4 → 10/3 | note:Eb4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.2 0.08] ]",
   "[ (10/3 → 27/8) ⇝ 41/12 | note:G4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.2 0.08] ]",
   "[ 10/3 ⇜ (27/8 → 41/12) | note:G4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.2 0.01] ]",
   "[ 41/12 → 7/2 | note:Bb4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.2 0.01] ]",
-  "[ 7/2 → 43/12 | note:Eb5 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.01] ]",
+  "[ 7/2 → 43/12 | note:Eb4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.01] ]",
   "[ 43/12 → 11/3 | note:G4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.01] ]",
   "[ 11/3 → 15/4 | note:Bb4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[2 0 0.1 0.3 0.01] ]",
-  "[ 15/4 → 23/6 | note:Eb5 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[16 0.1 1 0.2 0.013] ]",
+  "[ 15/4 → 23/6 | note:Eb4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[16 0.1 1 0.2 0.013] ]",
   "[ 23/6 → 47/12 | note:G4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[16 0.1 1 0.2 0.013] ]",
   "[ 47/12 → 4/1 | note:Bb4 s:saw workletSrc:saw(saw(sFreq / pat[0]).mul(8).add(sFreq).lag(pat[1])).mul(0.3).mul(sGate.adsr(0  0.15  0.5  pat[2])).lpf(sGate.adsr(0  0.2  0.3  0.2).mul(1).add(0)).add(x => x.delay(pat[3]).mul(0.7)).add(x => x.delay(pat[4]).mul(0.77)).mul(0.7).add(x => x.delay(0.13).mul(0.7)).out() workletInputs:[16 0.1 1 0.2 0.013] ]",
 ]
@@ -3422,30 +3422,6 @@ exports[`runs examples > example "djf" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "dough" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:F3 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 0/1 → 1/1 | note:C4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 0/1 → 1/1 | note:D4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 0/1 → 1/1 | note:E4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 0/1 → 1/1 | note:A4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 1/1 → 2/1 | note:A3 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 1/1 → 2/1 | note:D4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 1/1 → 2/1 | note:G4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 1/1 → 2/1 | note:C5 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 2/1 → 3/1 | note:A4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 2/1 → 3/1 | note:C5 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 2/1 → 3/1 | note:D5 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 2/1 → 3/1 | note:F5 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 2/1 → 3/1 | note:C6 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 3/1 → 4/1 | note:A3 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 3/1 → 4/1 | note:D4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 3/1 → 4/1 | note:E4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 3/1 → 4/1 | note:F4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 3/1 → 4/1 | note:C5 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-]
-`;
-
 exports[`runs examples > example "drawLine" example index 0 1`] = `[]`;
 
 exports[`runs examples > example "drive" example index 0 1`] = `
@@ -5954,30 +5930,6 @@ exports[`runs examples > example "inhabit" example index 1 1`] = `
 ]
 `;
 
-exports[`runs examples > example "initDough" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:F3 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 0/1 → 1/1 | note:C4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 0/1 → 1/1 | note:D4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 0/1 → 1/1 | note:E4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 0/1 → 1/1 | note:A4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 1/1 → 2/1 | note:A3 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 1/1 → 2/1 | note:D4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 1/1 → 2/1 | note:G4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 1/1 → 2/1 | note:C5 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 2/1 → 3/1 | note:A4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 2/1 → 3/1 | note:C5 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 2/1 → 3/1 | note:D5 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 2/1 → 3/1 | note:F5 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 2/1 → 3/1 | note:C6 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 3/1 → 4/1 | note:A3 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 3/1 → 4/1 | note:D4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 3/1 → 4/1 | note:E4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 3/1 → 4/1 | note:F4 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-  "[ 3/1 → 4/1 | note:C5 phaserrate:3 fmi:1.4 fmh:1.01 ]",
-]
-`;
-
 exports[`runs examples > example "inside" example index 0 1`] = `
 [
   "[ 0/1 → 1/8 | note:D3 ]",
@@ -8522,19 +8474,6 @@ exports[`runs examples > example "often" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "onSchedule" example index 0 1`] = `
-[
-  "[ 0/1 → 1/2 | s:bd ]",
-  "[ 1/2 → 1/1 | s:sd ]",
-  "[ 1/1 → 3/2 | s:bd ]",
-  "[ 3/2 → 2/1 | s:sd ]",
-  "[ 2/1 → 5/2 | s:bd ]",
-  "[ 5/2 → 3/1 | s:sd ]",
-  "[ 3/1 → 7/2 | s:bd ]",
-  "[ 7/2 → 4/1 | s:sd ]",
-]
-`;
-
 exports[`runs examples > example "onTriggerTime" example index 0 1`] = `
 [
   "[ 0/1 → 1/8 | s:bd ]",

test/__snapshots__/tunes.test.mjs.snap

@@ -7203,12 +7203,8 @@ exports[`renders tunes > tune: holyflute 1`] = `
 
 exports[`renders tunes > tune: juxUndTollerei 1`] = `
 [
-  "[ -99/200 ⇜ (0/1 → 1/200) | note:63 s:triangle pan:0 cutoff:758.852817928549 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
-  "[ -99/200 ⇜ (0/1 → 1/200) | note:67 s:triangle pan:1 color:green cutoff:758.852817928549 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
   "[ 0/1 → 1/4 | note:c3 s:sawtooth pan:0 cutoff:1100 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
   "[ 0/1 → 1/4 | note:bb3 s:sawtooth pan:1 color:green cutoff:1100 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
-  "[ 1/200 → 101/200 | note:55 s:triangle pan:0 cutoff:1103.534282651425 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
-  "[ 1/200 → 101/200 | note:65 s:triangle pan:1 color:green cutoff:1103.534282651425 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
   "[ 1/4 → 1/2 | note:eb3 s:sawtooth pan:0 cutoff:1275.581289814515 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
   "[ 1/4 → 1/2 | note:g3 s:sawtooth pan:1 color:green cutoff:1275.581289814515 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
   "[ 1/2 → 3/4 | note:g3 s:sawtooth pan:0 cutoff:1444.415089128581 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",

test/runtime.mjs

@@ -99,7 +99,6 @@ const toneHelpersMocked = {
   '_spectrum',
   'markcss',
   'p',
-  'dough',
 ].forEach((mock) => {
   strudel.Pattern.prototype[mock] = function () {
     return this;
@@ -175,7 +174,6 @@ evalScope(
     getDuration,
     setcps: id,
     setcpm: id,
-    initDough: id,
     Clock: {}, // whatever
   },
 );

undocumented.json

@@ -597,8 +597,8 @@
   ],
   "/packages/superdough/dspworklet.mjs": [
     "dspWorklet",
-    "rawdsp",
+    "dough",
-    "rawdspTrigger"
+    "doughTrigger"
   ],
   "/packages/superdough/index.mjs": [],
   "/packages/tonal/tonleiter.mjs": [

website/astro.config.mjs

@@ -145,13 +145,4 @@ export default defineConfig({
       // external: ['fraction.js'], // https://github.com/infusion/Fraction.js/issues/51
     },
   },
-  server: {
-    // these are needed for dough, which uses shared memory
-    // see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer#security_requirements
-    // this is only for the dev server, so the server strudel runs on, also needs those
-    headers: {
-      'Cross-Origin-Opener-Policy': 'same-origin',
-      'Cross-Origin-Embedder-Policy': 'credentialless',
-    },
-  },
 });

website/package.json

@@ -41,7 +41,6 @@
     "@strudel/motion": "workspace:*",
     "@strudel/mqtt": "workspace:*",
     "@strudel/osc": "workspace:*",
-    "@strudel/dough": "workspace:*",
     "@strudel/serial": "workspace:*",
     "@strudel/soundfonts": "workspace:*",
     "@strudel/tidal": "workspace:*",

website/src/components/HeadCommon.astro

@@ -24,7 +24,7 @@ const baseNoTrailing = BASE_URL.endsWith('/') ? BASE_URL.slice(0, -1) : BASE_URL
 
 <base href={BASE_URL} />
 
-<!-- Scrollable accessibility code helper -->
+<!-- Scrollable a11y code helper -->
 <script src={`${baseNoTrailing}/make-scrollable-code-focusable.js`} is:inline></script>
 
 <script src="/src/pwa.ts"></script>

website/src/components/HeadCommonNext.astro

@@ -23,7 +23,7 @@ const baseNoTrailing = BASE_URL.endsWith('/') ? BASE_URL.slice(0, -1) : BASE_URL
 
 <base href={BASE_URL} />
 
-<!-- Scrollable accessibility code helper -->
+<!-- Scrollable a11y code helper -->
 <script src={`${baseNoTrailing}/make-scrollable-code-focusable.js`} is:inline></script>
 
 <script src="/src/pwa.ts"></script>

website/src/components/HeadSEO.astro

@@ -16,7 +16,7 @@ const imageAlt = frontmatter.image?.alt ?? OPEN_GRAPH.image.alt;
 <!-- Page Metadata -->
 <link rel="canonical" href={canonicalUrl} />
 
-<!-- og Tags -->
+<!-- OpenGraph Tags -->
 <meta property="og:title" content={formattedContentTitle} />
 <meta property="og:type" content="article" />
 <meta property="og:url" content={canonicalUrl} />

website/src/docs/MiniRepl.jsx

@@ -22,7 +22,7 @@ export function MiniRepl({
   tunes,
   hideHeader = false,
   canvasHeight = 100,
-  onSchedule,
+  onTrigger,
   punchcard,
   punchcardLabels = true,
   claviature,
@@ -58,8 +58,8 @@ export function MiniRepl({
       drawTime,
       drawContext,
       editPattern: (pat, id) => {
-        if (onSchedule) {
+        if (onTrigger) {
-          pat = pat.onSchedule(onSchedule, false);
+          pat = pat.onTrigger(onTrigger, false);
         }
         if (claviature) {
           pat = pat.onPaint((ctx, time, haps, drawTime) => {

website/src/pages/learn/csound.mdx

@@ -150,3 +150,5 @@ In the future, the integration could be improved by passing all patterned contro
 This could work by a unique [channel](https://kunstmusik.github.io/icsc2022-csound-web/tutorial2-interacting-with-csound/#step-4---writing-continuous-data-channels)
 for each value. Channels could be read [like this](https://github.com/csound/csound/blob/master/Android/CsoundForAndroid/CsoundAndroidExamples/src/main/res/raw/multitouch_xy.csd).
 Also, it might make sense to have a standard library of csound instruments for strudel's effects.
+
+Now, let's dive into the [Functional JavaScript API](/functions/intro)

website/src/pages/learn/faq.mdx

@@ -52,15 +52,6 @@ There are multiple ways to load your sample collection. Some methods are good fo
 - Serve a folder of samples locally using the [strudel 'sampler' commandline tool](https://strudel.cc/learn/samples/#from-disk-via-strudelsampler). This can be most reliable method, but requires [nodejs](https://nodejs.org) to be installed.
 - Host your sound library online on the web and [load them from an URL](/learn/samples/#loading-custom-samples)
 
-## Can I create a new project based on Strudel?
-
-Strudel is free/open source software, and we are always happy to see people making use of it within the following terms:
-
-- Please don't use 'strudel' in the name of your project (e.g. strudel2000, foo-strudel), so people don't assume it's official strudel project. (If you'd like it to be an official strudel project, please check in with the community, e.g. on the [discord chat](https://discord.com/invite/HGEdXmRkzT).)
-- Please respect our AGPL license, which e.g. requires you to share/link to the source code of strudel, any modifications you've made to it, and the source code for the rest of your project if it integrates with strudel. You are also required to maintain Strudel's copyright notices in the source code, and include Strudel's copyright notice in your user interface. This is an ad-hoc summary - please [refer to the license](https://codeberg.org/uzu/strudel/src/branch/main/LICENSE) for full details.
-
-You are also encouraged to connect with [the community](https://discord.com/invite/HGEdXmRkzT) to understand our aims and values.
-
 ## Can I use Strudel with AI/LLM tools?
 
 You are free to do what you like with Strudel, within the terms of the free/open source AGPLv3 license.

website/src/pages/learn/lfo.mdx

@@ -45,7 +45,7 @@ Here, the LFO will modulate the low pass filter `.lpf`.
 
 ## Moving away from the default
 
-The following sections explain how to pass parameters to `.lfo`. Similar to `._spectrum` above, almost all the configuration of `lfo` lives inside a json object, starting with `{` and ending with `}`.
+The following sections explain how pass parameters to `.lfo`. Similar to `._spectrum` above, almost all the configuration of `lfo` lives inside a json object, starting with `{` and ending with `}`.
 All the parameters (except `id`) are written as `key: value` inside and separated by `,`.
 
 The reference refers to them as `config.key`, i.e. for the following one as `config.control` but you use them like below.

website/src/pages/technical-manual/internals.mdx

@@ -186,9 +186,9 @@ These functions are more low level, probably not needed by the live coder.
 
 # Other
 
-## onSchedule
+## onTrigger
 
-<JsDoc client:idle name="Pattern#onSchedule" h={0} />
+<JsDoc client:idle name="Pattern#onTrigger" h={0} />
 
 ## log
 

website/src/pages/technical-manual/repl.mdx

@@ -17,7 +17,7 @@ Besides a UI for playback control and meta information, the main part of the REP
 
 1. The user writes and updates code. Each update transpiles and evaluates it to create a `Pattern` instance
 2. While the REPL is running, the `Scheduler` queries the active `Pattern` by a regular interval, generating `Events` (also known as `Haps` in Strudel) for the next time span.
-3. For each scheduling tick, all generated `Events` are triggered by calling their `onSchedule` method, which is set by the output.
+3. For each scheduling tick, all generated `Events` are triggered by calling their `onTrigger` method, which is set by the output.
 
 <img src="https://codeberg.org/uzu/strudel/raw/branch/talk/talk/public/strudelflow.png" width="600" />
 
@@ -134,7 +134,10 @@ let minLatency = 0.1; // min time before a hap should trigger
 setInterval(() => {
   const haps = pattern.queryArc(time, time + interval);
   time += interval; // increment time
-  haps.forEach((hap) => onSchedule(hap, hap.whole.begin + minLatency));
+  haps.forEach((hap) => {
+    const deadline = hap.whole.begin - time + minLatency;
+    onTrigger(hap, deadline, duration);
+  });
 }, interval * 1000); // query each "interval" seconds
 ```
 
@@ -178,19 +181,20 @@ This example creates the custom control parameters `x` and `y` which are then us
 
 ### Outputs
 
-Now that we know how the value of an hap is manipulated using control parameters, we can look at how outputs can use that value to generate anything. The scheduler above was calling the `onSchedule` function which is used to implement the output. A very simple version of the web audio output could look like this:
+Now that we know how the value of an event is manipulated using control parameters, we can look at how outputs can use that value to generate anything. The scheduler above was calling the `onTrigger` function which is used to implement the output. A very simple version of the web audio output could look like this:
 
 ```js
-function onSchedule(hap, time, cps) {
+function onTrigger(hap, deadline, duration) {
   const { note } = hap.value;
+  const time = getAudioContext().currentTime + deadline;
   const o = getAudioContext().createOscillator();
   o.frequency.value = getFreq(note);
   o.start(time);
-  o.stop(time + hap.duration / cps);
+  o.stop(time + event.duration);
   o.connect(getAudioContext().destination);
 }
 ```
 
-The above example will create an `OscillatorNode` for each hap, where the frequency is controlled by the `note` param. In essence, this is how the WebAudio API output of Strudel works, only with many more parameters to control synths, samples and effects.
+The above example will create an `OscillatorNode` for each event, where the frequency is controlled by the `note` param. In essence, this is how the WebAudio API output of Strudel works, only with many more parameters to control synths, samples and effects.
 
 I want to help, how do I contribute to the [Docs](/technical-manual/docs)?

website/src/pages/understand/voicings.mdx

@@ -287,10 +287,7 @@ The modes are:
 - `below`: the top note of the voicing is lower than or equal to the anchor (default)
 - `above`: the bottom note of the voicing is higher than or equal to the anchor
 - `duck`: the top note of the voicing is lower than the anchor
-- `root`: the bottom note of the voicing is always the lowest root note higher than or equal to the anchor
+- `root`: the bottom note of the voicing is always the root note closest to the anchor
-
-- `oldabove` : old (buggy) behavior of above, kept for legacy reasons
-- `oldroot` : old (buggy) behavior of root, kept for legacy reasons
 
 The `anchor` can also be set from within the `mode` function:
 

website/src/repl/audiograph.mjs

@@ -628,7 +628,7 @@ export const debugAudiograph = async (argOptions = {}) => {
 
   /*global all*/
   all((pat) =>
-    pat.onSchedule(async (hap, t, cps) => {
+    pat.onTrigger(async (hap, duration, cps, t) => {
       hap_count++;
       const key = Object.entries(hap.value)
         .map((param) => param.join('/'))

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

@@ -214,12 +214,7 @@ export const Reference = memo(function Reference() {
                 </p>
               )}
 
-              <p
+              <p dangerouslySetInnerHTML={{ __html: entry.description }}></p>
-                dangerouslySetInnerHTML={{
-                  // If we have an external url make sure it opens in another tab to not interrupt the player
-                  __html: entry.description.replaceAll(/<a href="https:\/\//g, `<a target="_blank" href="https://`),
-                }}
-              ></p>
               <ul>
                 {entry.params?.map(({ name, type, description }, i) => (
                   <li key={i}>

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

@@ -36,9 +36,8 @@ export function WelcomeTab({ context }) {
         <a href="https://tidalcycles.org/" target="_blank">
           tidalcycles
         </a>
-        , which is a popular live coding language for music, written in Haskell. Strudel is free/open source software,
+        , which is a popular live coding language for music, written in Haskell. Strudel is free/open source software:
-        with copyright owned by its [contributors](https://codeberg.org/uzu/strudel/activity/contributors). You can
+        you can redistribute and/or modify it under the terms of the{' '}
-        redistribute and/or modify it under the terms of the{' '}
         <a href="https://codeberg.org/uzu/strudel/src/branch/main/LICENSE" target="_blank">
           GNU Affero General Public License
         </a>

website/src/repl/util.mjs

@@ -85,7 +85,6 @@ export function loadModules() {
     import('@strudel/motion'),
     import('@strudel/mqtt'),
     import('@strudel/mondo'),
-    import('@strudel/dough'),
   ];
   if (isTauri()) {
     modules = modules.concat([

website/src/settings.mjs

@@ -138,7 +138,7 @@ export const setIsZen = (active) => settingsMap.setKey('isZen', !!active);
 
 const patternSetting = (key) =>
   register(key, (value, pat) =>
-    pat.onSchedule(() => {
+    pat.onTrigger(() => {
       value = Array.isArray(value) ? value.join(' ') : value;
       if (value !== settingsMap.get()[key]) {
         settingsMap.setKey(key, value);