Merge remote-tracking branch 'origin/main' into general-purpose-scheduler

packages/react/src/App.jsx

@@ -1,13 +1,9 @@
 import React from 'react';
 import { MiniRepl } from './components/MiniRepl';
 import 'tailwindcss/tailwind.css';
-import { Tone, getDefaultSynth } from '@strudel.cycles/tone';
 import { evalScope } from '@strudel.cycles/eval';
 
-const defaultSynth = getDefaultSynth();
-
 evalScope(
-  Tone,
   import('@strudel.cycles/core'),
   import('@strudel.cycles/tone'),
   import('@strudel.cycles/tonal'),
@@ -20,7 +16,7 @@ evalScope(
 function App() {
   return (
     <div>
-      <MiniRepl tune={`"c3"`} defaultSynth={defaultSynth} />
+      <MiniRepl tune={`"c3"`} />
     </div>
   );
 }

packages/react/src/components/MiniRepl.jsx

@@ -10,11 +10,10 @@ import styles from './MiniRepl.module.css';
 import { Icon } from './Icon';
 import { Tone } from '@strudel.cycles/tone';
 
-export function MiniRepl({ tune, defaultSynth, hideOutsideView = false, theme, init, onEvent, enableKeyboard }) {
+export function MiniRepl({ tune, hideOutsideView = false, init, onEvent, enableKeyboard }) {
   const { code, setCode, pattern, activeCode, activateCode, evaluateOnly, error, cycle, dirty, togglePlay, stop } =
     useRepl({
       tune,
-      defaultSynth,
       autolink: false,
       onEvent,
     });

packages/react/src/hooks/useRepl.mjs

@@ -6,9 +6,9 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import { useCallback, useState, useMemo } from 'react';
 import { evaluate } from '@strudel.cycles/eval';
-import { getPlayableNoteValue } from '@strudel.cycles/core/util.mjs';
 import useCycle from './useCycle.mjs';
 import usePostMessage from './usePostMessage.mjs';
+import { webaudioOutputTrigger } from '@strudel.cycles/webaudio';
 
 let s4 = () => {
   return Math.floor((1 + Math.random()) * 0x10000)
@@ -17,7 +17,7 @@ let s4 = () => {
 };
 const generateHash = (code) => encodeURIComponent(btoa(code));
 
-function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawProp }) {
+function useRepl({ tune, autolink = true, onEvent, onDraw: onDrawProp }) {
   const id = useMemo(() => s4(), []);
   const [code, setCode] = useState(tune);
   const [activeCode, setActiveCode] = useState();
@@ -48,26 +48,15 @@ function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawP
           if (event.context.logs?.length) {
             event.context.logs.forEach(pushLog);
           }
-          const { onTrigger, velocity } = event.context;
-          if (!onTrigger) {
-            if (defaultSynth) {
-              const note = getPlayableNoteValue(event);
-              defaultSynth.triggerAttackRelease(note, event.duration.valueOf(), time, velocity);
-            } else {
-              throw new Error('no defaultSynth passed to useRepl.');
-            }
-            /* console.warn('no instrument chosen', event);
-          throw new Error(`no instrument chosen for ${JSON.stringify(event)}`); */
-          } else {
-            onTrigger(time, event, currentTime, 1 /* cps */);
-          }
+          const { onTrigger = webaudioOutputTrigger } = event.context;
+          onTrigger(time, event, currentTime, 1 /* cps */);
         } catch (err) {
           console.warn(err);
           err.message = 'unplayable event: ' + err?.message;
           pushLog(err.message); // not with setError, because then we would have to setError(undefined) on next playable event
         }
       },
-      [onEvent, pushLog, defaultSynth],
+      [onEvent, pushLog],
     ),
     onQuery: useCallback(
       (state) => {