From dea1c31701a9ad8b0bbb081c85401b088f480f88 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Wed, 27 Sep 2023 22:10:21 +0200
Subject: [PATCH] use midicmd instead of clock

---
 packages/core/controls.mjs |  2 +-
 packages/midi/midi.mjs     | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 62cfdd46..d1a9ce7f 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -1066,7 +1066,7 @@ const generic_params = [
    */
   ['waveloss'],
   // TODO: midi effects?
-  ['clock'],
+  ['midicmd'],
   ['dur'],
   // ['modwheel'],
   ['expression'],
diff --git a/packages/midi/midi.mjs b/packages/midi/midi.mjs
index 32583d75..ee111d7e 100644
--- a/packages/midi/midi.mjs
+++ b/packages/midi/midi.mjs
@@ -90,13 +90,6 @@ Pattern.prototype.midi = function (output) {
   enableWebMidi({
     onEnabled: ({ outputs }) => {
       const device = getDevice(output, outputs);
-      if (typeof window !== 'undefined') {
-        window.addEventListener('message', (e) => {
-          if (e.data === 'strudel-stop') {
-            device.sendStop();
-          }
-        });
-      }
       const otherOutputs = outputs.filter((o) => o.name !== device.name);
       logger(
         `Midi enabled! Using "${device.name}". ${
@@ -121,7 +114,7 @@ Pattern.prototype.midi = function (output) {
     const timeOffsetString = `+${offset}`;
 
     // destructure value
-    const { note, nrpnn, nrpv, ccn, ccv, midichan = 1, clock } = hap.value;
+    const { note, nrpnn, nrpv, ccn, ccv, midichan = 1, midicmd } = hap.value;
     const velocity = hap.context?.velocity ?? 0.9; // TODO: refactor velocity
 
     // note off messages will often a few ms arrive late, try to prevent glitching by subtracting from the duration length
@@ -143,12 +136,14 @@ Pattern.prototype.midi = function (output) {
       const scaled = Math.round(ccv * 127);
       device.sendControlChange(ccn, scaled, midichan, { time: timeOffsetString });
     }
-    const begin = hap.whole.begin + 0;
-    if (begin === 0) {
-      device.sendStart({ time: timeOffsetString });
-    }
-    if (clock) {
+    if (['clock', 'midiClock'].includes(midicmd)) {
       device.sendClock({ time: timeOffsetString });
+    } else if (['start'].includes(midicmd)) {
+      device.sendStart({ time: timeOffsetString });
+    } else if (['stop'].includes(midicmd)) {
+      device.sendStop({ time: timeOffsetString });
+    } else if (['continue'].includes(midicmd)) {
+      device.sendContinue({ time: timeOffsetString });
     }
   });
 };