@grame/faustwasm 0.5.4 → 0.6.0

package/dist/cjs/index.d.ts

@@ -699,11 +699,13 @@ export declare class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
 	protected fSampleSize: number;
 	protected fPitchwheelLabel: {
 		path: string;
+		chan: number;
 		min: number;
 		max: number;
 	}[];
 	protected fCtrlLabel: {
 		path: string;
+		chan: number;
 		min: number;
 		max: number;
 	}[][];

package/dist/cjs/index.js

@@ -2120,11 +2120,24 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
             if (midi) {
               const strMidi = midi.trim();
               if (strMidi === "pitchwheel") {
-                this.fPitchwheelLabel.push({ path: item.address, min: item.min, max: item.max });
-              } else {
-                const matched = strMidi.match(/^ctrl\s(\d+)/);
+                const matched = strMidi.match(/^pitchwheel\s(\d+)/);
                 if (matched) {
-                  this.fCtrlLabel[parseInt(matched[1])].push({ path: item.address, min: item.min, max: item.max });
+                  this.fPitchwheelLabel.push({ path: item.address, chan: parseInt(matched[1]), min: item.min, max: item.max });
+                } else {
+                  this.fPitchwheelLabel.push({ path: item.address, chan: 0, min: item.min, max: item.max });
+                }
+              } else {
+                const matched2 = strMidi.match(/^ctrl\s(\d+)\s(\d+)/);
+                const matched1 = strMidi.match(/^ctrl\s(\d+)/);
+                if (matched2) {
+                  console.log("matched2", matched2);
+                  console.log("matched2[1]", matched2[1]);
+                  console.log("matched2[2]", matched2[2]);
+                  this.fCtrlLabel[parseInt(matched2[1])].push({ path: item.address, chan: parseInt(matched2[2]), min: item.min, max: item.max });
+                } else if (matched1) {
+                  console.log("matched1", matched1);
+                  console.log("matched1[1]", matched1[1]);
+                  this.fCtrlLabel[parseInt(matched1[1])].push({ path: item.address, chan: 0, min: item.min, max: item.max });
                 }
               }
             }
@@ -2392,10 +2405,13 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
         this.fCachedEvents.push({ type: "ctrlChange", data: [channel, ctrl, value] });
       if (this.fCtrlLabel[ctrl].length) {
         this.fCtrlLabel[ctrl].forEach((ctrl2) => {
-          const { path } = ctrl2;
-          this.setParamValue(path, _FaustBaseWebAudioDsp.remap(value, 0, 127, ctrl2.min, ctrl2.max));
-          if (this.fOutputHandler)
-            this.fOutputHandler(path, this.getParamValue(path));
+          const { path, chan } = ctrl2;
+          console.log("ctrlChange", path, chan, channel);
+          if (chan === 0 || channel === chan - 1) {
+            this.setParamValue(path, _FaustBaseWebAudioDsp.remap(value, 0, 127, ctrl2.min, ctrl2.max));
+            if (this.fOutputHandler)
+              this.fOutputHandler(path, this.getParamValue(path));
+          }
         });
       }
     }
@@ -2403,9 +2419,12 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       if (this.fPlotHandler)
         this.fCachedEvents.push({ type: "pitchWheel", data: [channel, wheel] });
       this.fPitchwheelLabel.forEach((pw) => {
-        this.setParamValue(pw.path, _FaustBaseWebAudioDsp.remap(wheel, 0, 16383, pw.min, pw.max));
-        if (this.fOutputHandler)
-          this.fOutputHandler(pw.path, this.getParamValue(pw.path));
+        const { path, chan } = pw;
+        if (chan === 0 || channel === chan - 1) {
+          this.setParamValue(path, _FaustBaseWebAudioDsp.remap(wheel, 0, 16383, pw.min, pw.max));
+          if (this.fOutputHandler)
+            this.fOutputHandler(path, this.getParamValue(path));
+        }
       });
     }
     setParamValue(path, value) {