Merge branch 'main' into glossing/sample-looping-bugfix

Reviewed-on: https://codeberg.org/uzu/strudel/pulls/1874

README.md

@@ -1,14 +1,17 @@
 # strudel
 
 Live coding patterns on the web
-https://strudel.cc/
+
 
 - Try it here: <https://strudel.cc>
 - Docs: <https://strudel.cc/learn>
+- Source: https://codeberg.org/uzu/strudel/
+  * Along with many other live coding projects, we have moved from Microsoft's Github platform to Codeberg for ethical reasons. **Please don't fork the project back to github**.
 - Technical Blog Post: <https://loophole-letters.vercel.app/strudel>
 - 1 Year of Strudel Blog Post: <https://loophole-letters.vercel.app/strudel1year>
 - 2 Years of Strudel Blog Post: <https://strudel.cc/blog/#year-2>
 
+
 ## Running Locally
 
 After cloning the project, you can run the REPL locally:

packages/core/controls.mjs

@@ -2844,7 +2844,7 @@ registerSubControls('lfo', [
   ['dcoffset', 'dc'],
   ['shape', 'sh'],
   ['skew', 'sk'],
-  ['curve'],
+  ['curve', 'cu'],
   ['sync', 's'],
   ['fxi'],
 ]);
@@ -2872,7 +2872,7 @@ registerSubControls('bmod', [
   ['fxi'],
 ]);
 
-Pattern.prototype.modulate = function (type, config, id) {
+Pattern.prototype.modulate = function (type, config, idPat) {
   config = { control: undefined, ...config };
   const modulatorKeys = ['lfo', 'env', 'bmod'];
   if (!modulatorKeys.includes(type)) {
@@ -2881,11 +2881,14 @@ Pattern.prototype.modulate = function (type, config, id) {
   }
   let output = this;
   let defaultValue = undefined;
+  // Copy value into a temporary `v` container and attach a single `id` (to be shared across
+  // each config entry). At the output we destructure and throw away the id
+  output = output.fmap((v) => (id) => ({ v, id })).appLeft(reify(idPat));
   for (const [rawKey, value] of Object.entries(config)) {
     const key = getMainSubcontrolName(type, rawKey);
     const valuePat = reify(value);
     output = output
-      .fmap((v) => (c) => {
+      .fmap(({ v, id }) => (c) => {
         if (defaultValue === undefined) {
           // default control to the control set just before this in the chain
           // e.g. pat.gain(0.5).lfo({..}) will be a gain-LFO
@@ -2900,17 +2903,17 @@ Pattern.prototype.modulate = function (type, config, id) {
         id ??= t.__ids.size;
         t[id] ??= { control: defaultValue };
         t.__ids.add(id); // keeps track of insertion order
-        if (c === undefined) return v;
+        if (c === undefined) return { v, id };
         if (key === 'control' || key === 'subControl') {
           t[id][key] = getControlName(c);
         } else {
           t[id][key] = c;
         }
-        return v;
+        return { v, id };
       })
       .appLeft(valuePat);
   }
-  return output;
+  return output.fmap(({ v }) => v);
 };
 
 /**
@@ -2925,15 +2928,15 @@ Pattern.prototype.modulate = function (type, config, id) {
  *
  * @name lfo
  * @param {Object} config LFO configuration.
- * @param {string | Pattern} [config.control] Node to modulate. Aliases: t
- * @param {string | Pattern} [config.subControl] Sub-control name to append to the control key. Aliases: sc, p
- * @param {number | Pattern} [config.rate] Modulation rate. Aliases: rate, r
+ * @param {string | Pattern} [config.control] Node to modulate. Aliases: c
+ * @param {string | Pattern} [config.subControl] Sub-control name to append to the control key. Aliases: sc
+ * @param {number | Pattern} [config.rate] Modulation rate. Aliases: r
  * @param {number | Pattern} [config.depth] Relative modulation depth. Aliases: dep, dr
  * @param {number | Pattern} [config.depthabs] Absolute modulation depth. Aliases: da
  * @param {number | Pattern} [config.dcoffset] DC offset / bias for the waveform. Aliases: dc
  * @param {number | Pattern} [config.shape] Shape index. Aliases: sh
  * @param {number | Pattern} [config.skew] Skew amount. Aliases: sk
- * @param {number | Pattern} [config.curve] Exponential curve amount. Aliases: c
+ * @param {number | Pattern} [config.curve] Exponential curve amount. Aliases: cu
  * @param {number | Pattern} [config.sync] Tempo-synced modulation rate. Aliases: s
  * @param {number | Pattern} [config.fxi] FX index to target
  * @param {string | Pattern} id ID to use for this modulator
@@ -2978,8 +2981,8 @@ export const lfo = (config) => pure({}).lfo(config);
  *
  * @name env
  * @param {Object} config Envelope configuration.
- * @param {string | Pattern} [config.control] Node to modulate. Aliases: t
- * @param {string | Pattern} [config.subControl] Sub-control name to append to the control key. Aliases: sc, p
+ * @param {string | Pattern} [config.control] Node to modulate. Aliases: c
+ * @param {string | Pattern} [config.subControl] Sub-control name to append to the control key. Aliases: sc
  * @param {number | Pattern} [config.depth] Relative modulation depth. Aliases: dep, dr
  * @param {number | Pattern} [config.depthabs] Absolute modulation depth. Aliases: da
  * @param {number | Pattern} [config.attack] Time to reach depth. Aliases: att, a
@@ -3039,8 +3042,8 @@ export const env = (config) => pure({}).env(config);
  * @name bmod
  * @param {Object} config Bus modulation configuration.
  * @param {string | Pattern} [config.bus] Bus to get modulation signal from
- * @param {string | Pattern} [config.control] Node to modulate. Aliases: t
- * @param {string | Pattern} [config.subControl] Sub-control name to append to the control key. Aliases: sc, p
+ * @param {string | Pattern} [config.control] Node to modulate. Aliases: c
+ * @param {string | Pattern} [config.subControl] Sub-control name to append to the control key. Aliases: sc
  * @param {number | Pattern} [config.depth] Relative modulation depth. Aliases: dep, dr
  * @param {number | Pattern} [config.depthabs] Absolute modulation depth. Aliases: da
  * @param {number | Pattern} [config.dc] DC offset prior to application

packages/osc/README.md

@@ -46,4 +46,4 @@ all(osc)
 
 [open in repl](https://strudel.cc/#JDogcygiYmQqNCIpCgphbGwob3NjKQ%3D%3D)
 
-You can read more about [how to use Superdirt with Strudel the Tutorial](https://strudel.cc/learn/input-output/#superdirt-api)
+You can read more about [how to use Superdirt with Strudel](https://strudel.cc/learn/input-output/#oscsuperdirtstrudeldirt) in  the tutorial.

packages/superdough/sampler.mjs

@@ -65,21 +65,22 @@ export const getSampleBufferSource = async (hapValue, bank, resolveUrl) => {
   bufferSource.playbackRate.value = playbackRate;
 
   const { loopBegin = 0, loopEnd = 1, begin = 0, end = 1 } = hapValue;
+  const bufferDuration = bufferSource.buffer.duration;
 
-  // "The computation of the offset into the sound is performed using the sound buffer's natural sample rate,
-  // rather than the current playback rate, so even if the sound is playing at twice its normal speed,
-  // the midway point through a 10-second audio buffer is still 5."
-  const offset = begin * bufferSource.buffer.duration;
+  // The computation of the offset into the sound is performed using the sound buffer's natural duration,
+  // rather than the playback duration, so that even if the sound is playing at twice its normal speed,
+  // the midway point through a 10-second audio buffer is still 5.
+  const offset = begin * bufferDuration;
 
   const loop = hapValue.loop;
   if (loop) {
     bufferSource.loop = true;
-    bufferSource.loopStart = loopBegin * bufferSource.buffer.duration - offset;
-    bufferSource.loopEnd = loopEnd * bufferSource.buffer.duration - offset;
+    bufferSource.loopStart = loopBegin * bufferDuration;
+    bufferSource.loopEnd = loopEnd * bufferDuration;
   }
-  const bufferDuration = bufferSource.buffer.duration / bufferSource.playbackRate.value;
-  const sliceDuration = (end - begin) * bufferDuration;
-  return { bufferSource, offset, bufferDuration, sliceDuration };
+  const playbackDuration = bufferDuration / bufferSource.playbackRate.value;
+  const sliceDuration = (end - begin) * playbackDuration;
+  return { bufferSource, offset, bufferDuration, playbackDuration, sliceDuration };
 };
 
 export const loadBuffer = (url, ac, s, n = 0) => {