@grame/faustwasm 0.8.0 → 0.9.0

package/dist/cjs/index.js

@@ -216,6 +216,14 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
             this.pitchWheel(msg.data[0], msg.data[1]);
             break;
           }
+          case "keyOn": {
+            this.keyOn(msg.data[0], msg.data[1], msg.data[2]);
+            break;
+          }
+          case "keyOff": {
+            this.keyOff(msg.data[0], msg.data[1], msg.data[2]);
+            break;
+          }
           case "param": {
             this.setParamValue(msg.data.path, msg.data.value);
             break;
@@ -262,6 +270,12 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       pitchWheel(channel, wheel) {
         this.fDSPCode.pitchWheel(channel, wheel);
       }
+      keyOn(channel, pitch, velocity) {
+        this.fDSPCode.keyOn(channel, pitch, velocity);
+      }
+      keyOff(channel, pitch, velocity) {
+        this.fDSPCode.keyOff(channel, pitch, velocity);
+      }
       propagateAcc(accelerationIncludingGravity, invert = false) {
         this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
       }
@@ -2142,6 +2156,10 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       // MIDI handling
       this.fPitchwheelLabel = [];
       this.fCtrlLabel = new Array(128).fill(null).map(() => []);
+      // array of MIDI key handlers; array index is the MIDI note number
+      this.fMidiKeyLabel = new Array(128).fill(null).map(() => []);
+      this.fMidiKeyOnLabel = new Array(128).fill(null).map(() => []);
+      this.fMidiKeyOffLabel = new Array(128).fill(null).map(() => []);
       this.fPathTable = {};
       this.fUICallback = (item) => {
         if (item.type === "hbargraph" || item.type === "vbargraph") {
@@ -2154,6 +2172,7 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
           if (!item.meta)
             return;
           item.meta.forEach((meta) => {
+            var _a, _b, _c, _d, _e, _f;
             const { midi, acc, gyr } = meta;
             if (midi) {
               const strMidi = midi.trim();
@@ -2167,10 +2186,25 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
               } else {
                 const matched2 = strMidi.match(/^ctrl\s(\d+)\s(\d+)/);
                 const matched1 = strMidi.match(/^ctrl\s(\d+)/);
+                const matchedKey = strMidi.match(/^key\s+(\d+)(?:\s+(\d+))?$/);
+                const matchedKeyOn = strMidi.match(/^keyon\s+(\d+)(?:\s+(\d+))?$/);
+                const matchedKeyOff = strMidi.match(/^keyoff\s+(\d+)(?:\s+(\d+))?$/);
                 if (matched2) {
                   this.fCtrlLabel[parseInt(matched2[1])].push({ path: item.address, chan: parseInt(matched2[2]), min: item.min, max: item.max });
                 } else if (matched1) {
                   this.fCtrlLabel[parseInt(matched1[1])].push({ path: item.address, chan: 0, min: item.min, max: item.max });
+                } else if (matchedKey) {
+                  const note = parseInt(matchedKey[1]);
+                  const channel = matchedKey[2] ? parseInt(matchedKey[2]) : 0;
+                  this.fMidiKeyLabel[note].push({ path: item.address, chan: channel, min: (_a = item.min) != null ? _a : 0, max: (_b = item.max) != null ? _b : 1 });
+                } else if (matchedKeyOn) {
+                  const note = parseInt(matchedKeyOn[1]);
+                  const channel = matchedKeyOn[2] ? parseInt(matchedKeyOn[2]) : 0;
+                  this.fMidiKeyOnLabel[note].push({ path: item.address, chan: channel, min: (_c = item.min) != null ? _c : 0, max: (_d = item.max) != null ? _d : 1 });
+                } else if (matchedKeyOff) {
+                  const note = parseInt(matchedKeyOff[1]);
+                  const channel = matchedKeyOff[2] ? parseInt(matchedKeyOff[2]) : 0;
+                  this.fMidiKeyOffLabel[note].push({ path: item.address, chan: channel, min: (_e = item.min) != null ? _e : 0, max: (_f = item.max) != null ? _f : 1 });
                 }
               }
             }
@@ -2432,6 +2466,15 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
         return this.ctrlChange(channel, data1, data2);
       if (cmd === 14)
         return this.pitchWheel(channel, data2 * 128 + data1);
+      if (cmd === 9) {
+        if (data2 > 0)
+          return this.keyOn(channel, data1, data2);
+        else
+          return this.keyOff(channel, data1, data2);
+      }
+      if (cmd === 8) {
+        return this.keyOff(channel, data1, data2);
+      }
     }
     ctrlChange(channel, ctrl, value) {
       if (this.fPlotHandler)
@@ -2447,6 +2490,46 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
         });
       }
     }
+    keyOn(channel, pitch, velocity) {
+      if (this.fPlotHandler)
+        this.fCachedEvents.push({ type: "keyOn", data: [channel, pitch, velocity] });
+      this.fMidiKeyOnLabel[pitch].forEach((key) => {
+        const { path, chan } = key;
+        if (chan === 0 || channel === chan - 1) {
+          this.setParamValue(path, _FaustBaseWebAudioDsp.remap(velocity, 0, 127, key.min, key.max));
+          if (this.fOutputHandler)
+            this.fOutputHandler(path, this.getParamValue(path));
+        }
+      });
+      this.fMidiKeyLabel[pitch].forEach((key) => {
+        const { path, chan } = key;
+        if (chan === 0 || channel === chan - 1) {
+          this.setParamValue(path, _FaustBaseWebAudioDsp.remap(velocity, 0, 127, key.min, key.max));
+          if (this.fOutputHandler)
+            this.fOutputHandler(path, this.getParamValue(path));
+        }
+      });
+    }
+    keyOff(channel, pitch, velocity) {
+      if (this.fPlotHandler)
+        this.fCachedEvents.push({ type: "keyOff", data: [channel, pitch, velocity] });
+      this.fMidiKeyOffLabel[pitch].forEach((key) => {
+        const { path, chan } = key;
+        if (chan === 0 || channel === chan - 1) {
+          this.setParamValue(path, _FaustBaseWebAudioDsp.remap(velocity, 0, 127, key.min, key.max));
+          if (this.fOutputHandler)
+            this.fOutputHandler(path, this.getParamValue(path));
+        }
+      });
+      this.fMidiKeyLabel[pitch].forEach((key) => {
+        const { path, chan } = key;
+        if (chan === 0 || channel === chan - 1) {
+          this.setParamValue(path, 0);
+          if (this.fOutputHandler)
+            this.fOutputHandler(path, this.getParamValue(path));
+        }
+      });
+    }
     pitchWheel(channel, wheel) {
       if (this.fPlotHandler)
         this.fCachedEvents.push({ type: "pitchWheel", data: [channel, wheel] });
@@ -2482,6 +2565,12 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     hasSoundfiles() {
       return this.fSoundfiles.length > 0;
     }
+    startSensors() {
+      this.startSensors();
+    }
+    stopSensors() {
+      this.stopSensors();
+    }
     start() {
       this.fProcessing = true;
     }
@@ -2494,12 +2583,6 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       this.fComputeHandler = null;
       this.fPlotHandler = null;
     }
-    startSensors() {
-      this.startSensors();
-    }
-    stopSensors() {
-      this.stopSensors();
-    }
   };
   var FaustMonoWebAudioDsp = class extends FaustBaseWebAudioDsp {
     constructor(instance, sampleRate, sampleSize, bufferSize, soundfiles) {
@@ -3083,6 +3166,12 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     pitchWheel(chan, value) {
       this.fDSPCode.pitchWheel(chan, value);
     }
+    keyOn(channel, pitch, velocity) {
+      this.fDSPCode.keyOn(channel, pitch, velocity);
+    }
+    keyOff(channel, pitch, velocity) {
+      this.fDSPCode.keyOff(channel, pitch, velocity);
+    }
     setParamValue(path, value) {
       this.fDSPCode.setParamValue(path, value);
     }
@@ -3948,42 +4037,14 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     async startSensors() {
       if (this.hasAccInput) {
         if (window.DeviceMotionEvent) {
-          if (typeof window.DeviceMotionEvent.requestPermission === "function") {
-            try {
-              const response = await window.DeviceMotionEvent.requestPermission();
-              if (response === "granted") {
-                window.addEventListener("devicemotion", this.handleDeviceMotion, true);
-              } else if (response === "denied") {
-                alert("You have denied access to motion and orientation data. To enable it, go to Settings > Safari > Motion & Orientation Access.");
-                throw new Error("Unable to access the accelerometer.");
-              }
-            } catch (error) {
-              console.error(error);
-            }
-          } else {
-            window.addEventListener("devicemotion", this.handleDeviceMotion, true);
-          }
+          window.addEventListener("devicemotion", this.handleDeviceMotion, true);
         } else {
           console.log("Cannot set the accelerometer handler.");
         }
       }
       if (this.hasGyrInput) {
         if (window.DeviceMotionEvent) {
-          if (typeof window.DeviceOrientationEvent.requestPermission === "function") {
-            try {
-              const response = await window.DeviceOrientationEvent.requestPermission();
-              if (response === "granted") {
-                window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
-              } else if (response === "denied") {
-                alert("You have denied access to motion and orientation data. To enable it, go to Settings > Safari > Motion & Orientation Access.");
-                throw new Error("Unable to access the gyroscope.");
-              }
-            } catch (error) {
-              console.error(error);
-            }
-          } else {
-            window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
-          }
+          window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
         } else {
           console.log("Cannot set the gyroscope handler.");
         }
@@ -4047,6 +4108,10 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
         this.ctrlChange(channel, data1, data2);
       else if (cmd === 14)
         this.pitchWheel(channel, data2 * 128 + data1);
+      if (cmd === 8 || cmd === 9 && data2 === 0)
+        this.keyOff(channel, data1, data2);
+      else if (cmd === 9)
+        this.keyOn(channel, data1, data2);
       else
         this.port.postMessage({ type: "midi", data });
     }
@@ -4058,6 +4123,14 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       const e = { type: "pitchWheel", data: [channel, wheel] };
       this.port.postMessage(e);
     }
+    keyOn(channel, pitch, velocity) {
+      const e = { type: "keyOn", data: [channel, pitch, velocity] };
+      this.port.postMessage(e);
+    }
+    keyOff(channel, pitch, velocity) {
+      const e = { type: "keyOff", data: [channel, pitch, velocity] };
+      this.port.postMessage(e);
+    }
     get hasAccInput() {
       return __privateGet(this, _hasAccInput);
     }
@@ -4221,42 +4294,14 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     async startSensors() {
       if (this.hasAccInput) {
         if (window.DeviceMotionEvent) {
-          if (typeof window.DeviceMotionEvent.requestPermission === "function") {
-            try {
-              const response = await window.DeviceMotionEvent.requestPermission();
-              if (response === "granted") {
-                window.addEventListener("devicemotion", this.handleDeviceMotion, true);
-              } else if (response === "denied") {
-                alert("You have denied access to motion and orientation data. To enable it, go to Settings > Safari > Motion & Orientation Access.");
-                throw new Error("Unable to access the accelerometer.");
-              }
-            } catch (error) {
-              console.error(error);
-            }
-          } else {
-            window.addEventListener("devicemotion", this.handleDeviceMotion, true);
-          }
+          window.addEventListener("devicemotion", this.handleDeviceMotion, true);
         } else {
           console.log("Cannot set the accelerometer handler.");
         }
       }
       if (this.hasGyrInput) {
         if (window.DeviceMotionEvent) {
-          if (typeof window.DeviceOrientationEvent.requestPermission === "function") {
-            try {
-              const response = await window.DeviceOrientationEvent.requestPermission();
-              if (response === "granted") {
-                window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
-              } else if (response === "denied") {
-                alert("You have denied access to motion and orientation data. To enable it, go to Settings > Safari > Motion & Orientation Access.");
-                throw new Error("Unable to access the gyroscope.");
-              }
-            } catch (error) {
-              console.error(error);
-            }
-          } else {
-            window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
-          }
+          window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
         } else {
           console.log("Cannot set the gyroscope handler.");
         }
@@ -4309,6 +4354,12 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     pitchWheel(chan, value) {
       this.fDSPCode.pitchWheel(chan, value);
     }
+    keyOn(channel, pitch, velocity) {
+      this.fDSPCode.keyOn(channel, pitch, velocity);
+    }
+    keyOff(channel, pitch, velocity) {
+      this.fDSPCode.keyOff(channel, pitch, velocity);
+    }
     setParamValue(path, value) {
       this.fDSPCode.setParamValue(path, value);
     }