Merge pull request #769 from tidalcycles/patterns-tab

Patterns tab + Refactor Panel
tidalcycles · Dec 7, 2023 · f8d1e9e · f8d1e9e
2 parents c787bb2 + e551dfe
commit f8d1e9e
Show file tree

Hide file tree

Showing 16 changed files with 772 additions and 509 deletions.
diff --git a/packages/react/src/hooks/useStrudel.mjs b/packages/react/src/hooks/useStrudel.mjs
@@ -74,8 +74,11 @@ function useStrudel({
     }
   });
   const activateCode = useCallback(
-    async (autostart = true) => {
-      const res = await evaluate(code, autostart);
+    async (newCode, autostart = true) => {
+      if (newCode) {
+        setCode(code);
+      }
+      const res = await evaluate(newCode || code, autostart);
       broadcast({ type: 'start', from: id });
       return res;
     },

diff --git a/packages/superdough/sampler.mjs b/packages/superdough/sampler.mjs
@@ -1,4 +1,4 @@
-import { noteToMidi, valueToMidi } from './util.mjs';
+import { noteToMidi, valueToMidi, nanFallback } from './util.mjs';
 import { getAudioContext, registerSound } from './index.mjs';
 import { getEnvelope } from './helpers.mjs';
 import { logger } from './logger.mjs';
@@ -33,6 +33,7 @@ export const getSampleBufferSource = async (s, n, note, speed, freq, bank, resol
   const ac = getAudioContext();
   let sampleUrl;
   if (Array.isArray(bank)) {
+    n = nanFallback(n, 0);
     sampleUrl = bank[n % bank.length];
   } else {
     const midiDiff = (noteA) => noteToMidi(noteA) - midi;

diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
@@ -7,7 +7,7 @@ This program is free software: you can redistribute it and/or modify it under th
 import './feedbackdelay.mjs';
 import './reverb.mjs';
 import './vowel.mjs';
-import { clamp } from './util.mjs';
+import { clamp, nanFallback } from './util.mjs';
 import workletsUrl from './worklets.mjs?url';
 import { createFilter, gainNode, getCompressor } from './helpers.mjs';
 import { map } from 'nanostores';
@@ -322,6 +322,7 @@ export const superdough = async (value, deadline, hapDuration) => {
     compressorAttack,
     compressorRelease,
   } = value;
+  gain = nanFallback(gain, 1);
 
   //music programs/audio gear usually increments inputs/outputs from 1, so imitate that behavior
   channels = (Array.isArray(channels) ? channels : [channels]).map((ch) => ch - 1);

diff --git a/packages/superdough/util.mjs b/packages/superdough/util.mjs
@@ -1,3 +1,5 @@
+import { logger } from './logger.mjs';
+
 // currently duplicate with core util.mjs to skip dependency
 // TODO: add separate util module?
 
@@ -51,3 +53,11 @@ export const valueToMidi = (value, fallbackValue) => {
   }
   return fallbackValue;
 };
+
+export function nanFallback(value, fallback) {
+  if (isNaN(Number(value))) {
+    logger(`"${value}" is not a number, falling back to ${fallback}`, 'warning');
+    return fallback;
+  }
+  return value;
+}