@marmooo/midy 0.0.7 → 0.0.8

package/esm/midy.d.ts

@@ -256,14 +256,15 @@ export class Midy {
     releaseNote(channelNumber: any, noteNumber: any, velocity: any): Promise<any> | undefined;
     releaseSustainPedal(channelNumber: any, halfVelocity: any): any[];
     releaseSostenutoPedal(channelNumber: any, halfVelocity: any): any[];
-    handleMIDIMessage(statusByte: any, data1: any, data2: any): any;
+    handleMIDIMessage(statusByte: any, data1: any, data2: any): void | any[] | Promise<any>;
     handlePolyphonicKeyPressure(channelNumber: any, noteNumber: any, pressure: any): void;
     handleProgramChange(channelNumber: any, program: any): void;
     handleChannelPressure(channelNumber: any, pressure: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
     setPitchBend(channelNumber: any, pitchBend: any): void;
-    handleControlChange(channelNumber: any, controller: any, value: any): any;
+    handleControlChange(channelNumber: any, controller: any, value: any): void | any[];
     setBankMSB(channelNumber: any, msb: any): void;
+    updateModulation(channel: any): void;
     setModulation(channelNumber: any, modulation: any): void;
     setPortamentoTime(channelNumber: any, portamentoTime: any): void;
     setVolume(channelNumber: any, volume: any): void;
@@ -274,11 +275,12 @@ export class Midy {
     setPan(channelNumber: any, pan: any): void;
     setExpression(channelNumber: any, expression: any): void;
     setBankLSB(channelNumber: any, lsb: any): void;
+    dataEntryLSB(channelNumber: any, value: any): void;
     updateChannelGain(channel: any): void;
     setSustainPedal(channelNumber: any, value: any): void;
     setPortamento(channelNumber: any, value: any): void;
-    setReverb(channelNumber: any, reverb: any): void;
-    setChorus(channelNumber: any, chorus: any): void;
+    setReverbSendLevel(channelNumber: any, reverb: any): void;
+    setChorusSendLevel(channelNumber: any, chorus: any): void;
     setSostenutoPedal(channelNumber: any, value: any): void;
     setSoftPedal(channelNumber: any, softPedal: any): void;
     setVibratoRate(channelNumber: any, vibratoRate: any): void;
@@ -287,18 +289,20 @@ export class Midy {
     limitData(channel: any, minMSB: any, maxMSB: any, minLSB: any, maxLSB: any): void;
     limitDataMSB(channel: any, minMSB: any, maxMSB: any): void;
     handleRPN(channelNumber: any, value: any): void;
-    incrementRPNValue(channelNumber: any): void;
-    decrementRPNValue(channelNumber: any): void;
+    dataIncrement(channelNumber: any): void;
+    dataDecrement(channelNumber: any): void;
     setRPNMSB(channelNumber: any, value: any): void;
     setRPNLSB(channelNumber: any, value: any): void;
-    setDataEntry(channelNumber: any, value: any, isMSB: any): void;
+    dataEntryMSB(channelNumber: any, value: any): void;
     updateDetune(channel: any, detuneChange: any): void;
-    handlePitchBendRangeMessage(channelNumber: any): void;
+    handlePitchBendRangeRPN(channelNumber: any): void;
     setPitchBendRange(channelNumber: any, pitchBendRange: any): void;
-    handleFineTuningMessage(channelNumber: any): void;
+    handleFineTuningRPN(channelNumber: any): void;
     setFineTuning(channelNumber: any, fineTuning: any): void;
-    handleCoarseTuningMessage(channelNumber: any): void;
+    handleCoarseTuningRPN(channelNumber: any): void;
     setCoarseTuning(channelNumber: any, coarseTuning: any): void;
+    handleModulationDepthRangeRPN(channelNumber: any): void;
+    setModulationDepthRange(channelNumber: any, modulationDepthRange: any): void;
     allSoundOff(channelNumber: any): any[];
     resetAllControllers(channelNumber: any): void;
     allNotesOff(channelNumber: any): any[];

package/esm/midy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"AAuBA;IAwBE;;;;;;;;;;;;;;;;;;;;MAoBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAzED,qBAAmB;IACnB,kBAAc;IACd,qBAAmB;IACnB,yBAAqB;IACrB,2BAAuB;IACvB,cAAa;IACb,cAAa;IACb,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IA+ChB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;MAqBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAiBC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EAyDC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgGC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED;;;;MAoCC;IAED;;;;;MAqCC;IAED,sDA6BC;IAED,2BAEC;IAED,4BAEC;IAED,sCAKC;IAED,mFAGC;IAED,iDAiBC;IAED,iDAiCC;IAED,0DAmBC;IAED,uDAcC;IAED,wHAqCC;IAED,gDAQC;IAED,kGAgCC;IAED,0EAGC;IAED,sIAwDC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,gEAqBC;IAED,sFAcC;IAED,4DAIC;IAED,+DAcC;IAED,qEAGC;IAED,uDAOC;IAED,0EAkEC;IAED,+CAEC;IAED,yDAiBC;IAED,iEAEC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,+CAEC;IAED,sCAUC;IAED,sDAMC;IAED,oDAEC;IAED,iDASC;IAED,iDAIC;IAED,wDAWC;IAED,uDAGC;IAED,2DAGC;IAED,6DAGC;IAED,6DASC;IAED,kFAeC;IAED,2DAMC;IAGD,gDAqBC;IAED,4CAEC;IAED,4CAEC;IAED,gDAEC;IAED,gDAEC;IAED,+DAIC;IAED,oDAUC;IAED,sDAKC;IAED,iEAOC;IAED,kDAKC;IAED,yDAGC;IAED,oDAKC;IAED,6DAGC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,gBAEC;IAED,eAEC;IAED,eAEC;IAED,eAEC;IAED,4DAmBC;IAED,oBAQC;IAED,oBAQC;IAED,yDAgDC;IAED,yCAGC;IAED,mCAQC;IAED,6CAGC;IAED,2CAMC;IAED,+CAGC;IAED,+CAMC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AA1hDD;IASE,gFAKC;IAbD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}
+{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"AAuBA;IAwBE;;;;;;;;;;;;;;;;;;;;MAoBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAzED,qBAAmB;IACnB,kBAAc;IACd,qBAAmB;IACnB,yBAAqB;IACrB,2BAAuB;IACvB,cAAa;IACb,cAAa;IACb,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IA+ChB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;MAqBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAiBC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EAyDC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgGC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED;;;;MAoCC;IAED;;;;;MAqCC;IAED,sDA6BC;IAED,2BAEC;IAED,4BAEC;IAED,sCAKC;IAED,mFAGC;IAED,iDAiBC;IAED,iDAiCC;IAED,0DAmBC;IAED,uDAcC;IAED,wHAqCC;IAED,gDAQC;IAED,kGAgCC;IAED,0EAGC;IAED,sIAwDC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,wFAqBC;IAED,sFAcC;IAED,4DAIC;IAED,+DAcC;IAED,qEAGC;IAED,uDAOC;IAED,mFAkEC;IAED,+CAEC;IAED,qCAcC;IAED,yDAIC;IAED,iEAEC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,+CAEC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAED,oDAEC;IAED,0DASC;IAED,0DAIC;IAED,wDAWC;IAED,uDAGC;IAED,2DAGC;IAED,6DAGC;IAED,6DASC;IAED,kFAeC;IAED,2DAMC;IAED,gDAyBC;IAED,wCAEC;IAED,wCAEC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,8CAKC;IAED,yDAMC;IAED,gDAKC;IAED,6DAMC;IAED,wDAKC;IAED,6EAKC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,gBAEC;IAED,eAEC;IAED,eAEC;IAED,eAEC;IAED,4DAmBC;IAED,oBAQC;IAED,oBAQC;IAED,yDAgDC;IAED,yCAGC;IAED,mCAQC;IAED,6CAGC;IAED,2CAMC;IAED,+CAGC;IAED,+CAMC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAxjDD;IASE,gFAKC;IAbD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}

package/esm/midy.js

@@ -75,13 +75,13 @@ export class Midy {
             configurable: true,
             writable: true,
             value: 0
-        });
+        }); // cb
         Object.defineProperty(this, "masterCoarseTuning", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: 0
-        });
+        }); // cb
         Object.defineProperty(this, "mono", {
             enumerable: true,
             configurable: true,
@@ -748,7 +748,7 @@ export class Midy {
     startModulation(channel, note, time) {
         const { instrumentKey } = note;
         note.modLFOGain = new GainNode(this.audioContext, {
-            gain: this.cbToRatio(instrumentKey.modLfoToVolume) * channel.modulation,
+            gain: this.cbToRatio(instrumentKey.modLfoToVolume + channel.modulation),
         });
         note.modLFO = new OscillatorNode(this.audioContext, {
             frequency: this.centToHz(instrumentKey.freqModLFO),
@@ -995,7 +995,7 @@ export class Midy {
             case 5:
                 return this.setPortamentoTime(channelNumber, value);
             case 6:
-                return this.setDataEntry(channelNumber, value, true);
+                return this.dataEntryMSB(channelNumber, value);
             case 7:
                 return this.setVolume(channelNumber, value);
             case 10:
@@ -1005,7 +1005,7 @@ export class Midy {
             case 32:
                 return this.setBankLSB(channelNumber, value);
             case 38:
-                return this.setDataEntry(channelNumber, value, false);
+                return this.dataEntryLSB(channelNumber, value);
             case 64:
                 return this.setSustainPedal(channelNumber, value);
             case 65:
@@ -1022,13 +1022,13 @@ export class Midy {
             case 78:
                 return this.setVibratoDelay(channelNumber, value);
             case 91:
-                return this.setReverb(channelNumber, value);
+                return this.setReverbSendLevel(channelNumber, value);
             case 93:
-                return this.setChorus(channelNumber, value);
+                return this.setChorusSendLevel(channelNumber, value);
             case 96: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp18.pdf
-                return incrementRPNValue(channelNumber);
+                return this.dataIncrement(channelNumber);
             case 97: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp18.pdf
-                return decrementRPNValue(channelNumber);
+                return this.dataDecrement(channelNumber);
             case 100:
                 return this.setRPNLSB(channelNumber, value);
             case 101:
@@ -1054,22 +1054,24 @@ export class Midy {
     setBankMSB(channelNumber, msb) {
         this.channels[channelNumber].bankMSB = msb;
     }
-    setModulation(channelNumber, modulation) {
+    updateModulation(channel) {
         const now = this.audioContext.currentTime;
-        const channel = this.channels[channelNumber];
-        channel.modulation = (modulation / 127) *
-            (channel.modulationDepthRange * 100);
         const activeNotes = this.getActiveNotes(channel, now);
         activeNotes.forEach((activeNote) => {
             if (activeNote.modLFO) {
-                activeNote.gainNode.gain.setValueAtTime(this.cbToRatio(activeNote.instrumentKey.modLfoToVolume) *
-                    channel.modulation, now);
+                const { gainNode, instrumentKey } = activeNote;
+                gainNode.gain.setValueAtTime(this.cbToRatio(instrumentKey.modLfoToVolume + channel.modulation), now);
             }
             else {
                 this.startModulation(channel, activeNote, now);
             }
         });
     }
+    setModulation(channelNumber, modulation) {
+        const channel = this.channels[channelNumber];
+        channel.modulation = (modulation / 127) * channel.modulationDepthRange;
+        this.updateModulation(channel);
+    }
     setPortamentoTime(channelNumber, portamentoTime) {
         this.channels[channelNumber].portamentoTime = portamentoTime / 127;
     }
@@ -1098,6 +1100,10 @@ export class Midy {
     setBankLSB(channelNumber, lsb) {
         this.channels[channelNumber].bankLSB = lsb;
     }
+    dataEntryLSB(channelNumber, value) {
+        this.channels[channelNumber].dataLSB = value;
+        this.handleRPN(channelNumber, 0);
+    }
     updateChannelGain(channel) {
         const now = this.audioContext.currentTime;
         const volume = channel.volume * channel.expression;
@@ -1119,7 +1125,7 @@ export class Midy {
     setPortamento(channelNumber, value) {
         this.channels[channelNumber].portamento = value >= 64;
     }
-    setReverb(channelNumber, reverb) {
+    setReverbSendLevel(channelNumber, reverb) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const reverbEffect = channel.reverbEffect;
@@ -1129,7 +1135,7 @@ export class Midy {
         reverbEffect.wetGain.gain.cancelScheduledValues(now);
         reverbEffect.wetGain.gain.setValueAtTime(channel.reverb, now);
     }
-    setChorus(channelNumber, chorus) {
+    setChorusSendLevel(channelNumber, chorus) {
         const channel = this.channels[channelNumber];
         channel.chorus = chorus / 127;
         channel.chorusEffect.lfoGain = channel.chorus;
@@ -1195,31 +1201,34 @@ export class Midy {
             channel.dataMSB = minMSB;
         }
     }
-    // TODO: support 3-4?
     handleRPN(channelNumber, value) {
         const channel = this.channels[channelNumber];
         const rpn = channel.rpnMSB * 128 + channel.rpnLSB;
         switch (rpn) {
             case 0:
                 channel.dataLSB += value;
-                this.handlePitchBendRangeMessage(channelNumber);
+                this.handlePitchBendRangeRPN(channelNumber);
                 break;
             case 1:
                 channel.dataLSB += value;
-                this.handleFineTuningMessage(channelNumber);
+                this.handleFineTuningRPN(channelNumber);
                 break;
             case 2:
                 channel.dataMSB += value;
-                this.handleCoarseTuningMessage(channelNumber);
+                this.handleCoarseTuningRPN(channelNumber);
+                break;
+            case 5:
+                channel.dataLSB += value;
+                this.handleModulationDepthRangeRPN(channelNumber);
                 break;
             default:
                 console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
         }
     }
-    incrementRPNValue(channelNumber) {
+    dataIncrement(channelNumber) {
         this.handleRPN(channelNumber, 1);
     }
-    decrementRPNValue(channelNumber) {
+    dataDecrement(channelNumber) {
         this.handleRPN(channelNumber, -1);
     }
     setRPNMSB(channelNumber, value) {
@@ -1228,9 +1237,8 @@ export class Midy {
     setRPNLSB(channelNumber, value) {
         this.channels[channelNumber].rpnLSB = value;
     }
-    setDataEntry(channelNumber, value, isMSB) {
-        const channel = this.channels[channelNumber];
-        isMSB ? channel.dataMSB = value : channel.dataLSB = value;
+    dataEntryMSB(channelNumber, value) {
+        this.channels[channelNumber].dataMSB = value;
         this.handleRPN(channelNumber, 0);
     }
     updateDetune(channel, detuneChange) {
@@ -1244,7 +1252,7 @@ export class Midy {
                 .setValueAtTime(detune, now);
         });
     }
-    handlePitchBendRangeMessage(channelNumber) {
+    handlePitchBendRangeRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 99);
         const pitchBendRange = channel.dataMSB + channel.dataLSB / 100;
@@ -1258,7 +1266,7 @@ export class Midy {
             channel.pitchBend * 100;
         this.updateDetune(channel, detuneChange);
     }
-    handleFineTuningMessage(channelNumber) {
+    handleFineTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 127);
         const fineTuning = (channel.dataMSB * 128 + channel.dataLSB - 8192) / 8192;
@@ -1266,9 +1274,12 @@ export class Midy {
     }
     setFineTuning(channelNumber, fineTuning) {
         const channel = this.channels[channelNumber];
+        const prevFineTuning = channel.fineTuning;
         channel.fineTuning = fineTuning;
+        const detuneChange = channel.fineTuning - prevFineTuning;
+        this.updateDetune(channel, detuneChange);
     }
-    handleCoarseTuningMessage(channelNumber) {
+    handleCoarseTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitDataMSB(channel, 0, 127);
         const coarseTuning = channel.dataMSB - 64;
@@ -1276,7 +1287,22 @@ export class Midy {
     }
     setCoarseTuning(channelNumber, coarseTuning) {
         const channel = this.channels[channelNumber];
-        channel.fineTuning = coarseTuning;
+        const prevCoarseTuning = channel.coarseTuning;
+        channel.coarseTuning = coarseTuning;
+        const detuneChange = channel.coarseTuning - prevCoarseTuning;
+        this.updateDetune(channel, detuneChange);
+    }
+    handleModulationDepthRangeRPN(channelNumber) {
+        const channel = this.channels[channelNumber];
+        this.limitData(channel, 0, 127, 0, 127);
+        const modulationDepthRange = dataMSB + dataLSB / 128;
+        this.setModulationDepthRange(channelNumber, modulationDepthRange);
+    }
+    setModulationDepthRange(channelNumber, modulationDepthRange) {
+        const channel = this.channels[channelNumber];
+        channel.modulationDepthRange = modulationDepthRange;
+        channel.modulation = (modulation / 127) * channel.modulationDepthRange;
+        this.updateModulation(channel);
     }
     allSoundOff(channelNumber) {
         const now = this.audioContext.currentTime;
@@ -1367,9 +1393,9 @@ export class Midy {
                 switch (data[3]) {
                     case 1:
                         return this.handleMasterVolumeSysEx(data);
-                    case 3:
+                    case 3: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca25.pdf
                         return this.handleMasterFineTuningSysEx(data);
-                    case 4:
+                    case 4: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca25.pdf
                         return this.handleMasterCoarseTuningSysEx(data);
                     // case 5: // TODO: Global Parameter Control
                     default:
@@ -1494,9 +1520,9 @@ Object.defineProperty(Midy, "channelSettings", {
         dataLSB: 0,
         program: 0,
         pitchBend: 0,
-        fineTuning: 0,
-        coarseTuning: 0,
-        modulationDepthRange: 0.5,
+        fineTuning: 0, // cb
+        coarseTuning: 0, // cb
+        modulationDepthRange: 0.5, // cb
     }
 });
 Object.defineProperty(Midy, "effectSettings", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "A MIDI player/synthesizer written in JavaScript that supports GM-Lite/GM1 and SF2/SF3.",
   "repository": {
     "type": "git",

package/script/midy-GM1.d.ts

@@ -130,6 +130,7 @@ export class MidyGM1 {
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
     setPitchBend(channelNumber: any, pitchBend: any): void;
     handleControlChange(channelNumber: any, controller: any, value: any): void | any[];
+    updateModulation(channel: any): void;
     setModulation(channelNumber: any, modulation: any): void;
     setVolume(channelNumber: any, volume: any): void;
     panToGain(pan: any): {
@@ -138,6 +139,7 @@ export class MidyGM1 {
     };
     setPan(channelNumber: any, pan: any): void;
     setExpression(channelNumber: any, expression: any): void;
+    dataEntryLSB(channelNumber: any, value: any): void;
     updateChannelGain(channel: any): void;
     setSustainPedal(channelNumber: any, value: any): void;
     limitData(channel: any, minMSB: any, maxMSB: any, minLSB: any, maxLSB: any): void;
@@ -145,13 +147,13 @@ export class MidyGM1 {
     handleRPN(channelNumber: any): void;
     setRPNMSB(channelNumber: any, value: any): void;
     setRPNLSB(channelNumber: any, value: any): void;
-    setDataEntry(channelNumber: any, value: any, isMSB: any): void;
+    dataEntryMSB(channelNumber: any, value: any): void;
     updateDetune(channel: any, detuneChange: any): void;
-    handlePitchBendRangeMessage(channelNumber: any): void;
+    handlePitchBendRangeRPN(channelNumber: any): void;
     setPitchBendRange(channelNumber: any, pitchBendRange: any): void;
-    handleFineTuningMessage(channelNumber: any): void;
+    handleFineTuningRPN(channelNumber: any): void;
     setFineTuning(channelNumber: any, fineTuning: any): void;
-    handleCoarseTuningMessage(channelNumber: any): void;
+    handleCoarseTuningRPN(channelNumber: any): void;
     setCoarseTuning(channelNumber: any, coarseTuning: any): void;
     allSoundOff(channelNumber: any): any[];
     resetAllControllers(channelNumber: any): void;

package/script/midy-GM1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAqBA;IAmBE;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA9CD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAyBhB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;MAYC;IAED;;;;;;;;;;;;;;;;;;;;QAUC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EA+CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA8DC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,sDAGC;IAED,2BAEC;IAED,4BAEC;IAED,sCAGC;IAED,mFAGC;IAED,iDAiBC;IAED,iDAiCC;IAED,0DAmBC;IAED,wHA6BC;IAED,kGA6BC;IAED,0EAGC;IAED,sIAmDC;IAED,0FAGC;IAED,kEAeC;IAED,wFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,uDAOC;IAED,mFA+BC;IAED,yDAiBC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,sCAUC;IAED,sDAMC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,+DAIC;IAED,oDAUC;IAED,sDAKC;IAED,iEAOC;IAED,kDAKC;IAED,yDAGC;IAED,oDAKC;IAED,6DAGC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AA1iCD;IAOE,gFAKC;IAXD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}
+{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAqBA;IAmBE;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA9CD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAyBhB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;MAYC;IAED;;;;;;;;;;;;;;;;;;;;QAUC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EA+CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA8DC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,sDAGC;IAED,2BAEC;IAED,4BAEC;IAED,sCAGC;IAED,mFAGC;IAED,iDAiBC;IAED,iDAiCC;IAED,0DAmBC;IAED,wHA6BC;IAED,kGA6BC;IAED,0EAGC;IAED,sIAmDC;IAED,0FAGC;IAED,kEAeC;IAED,wFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,uDAOC;IAED,mFA+BC;IAED,qCAcC;IAED,yDAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,8CAKC;IAED,yDAMC;IAED,gDAKC;IAED,6DAMC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAtjCD;IAOE,gFAKC;IAXD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}

package/script/midy-GM1.js

@@ -719,7 +719,7 @@ class MidyGM1 {
             case 1:
                 return this.setModulation(channelNumber, value);
             case 6:
-                return this.setDataEntry(channelNumber, value, true);
+                return this.dataEntryMSB(channelNumber, value);
             case 7:
                 return this.setVolume(channelNumber, value);
             case 10:
@@ -727,7 +727,7 @@ class MidyGM1 {
             case 11:
                 return this.setExpression(channelNumber, value);
             case 38:
-                return this.setDataEntry(channelNumber, value, false);
+                return this.dataEntryLSB(channelNumber, value);
             case 64:
                 return this.setSustainPedal(channelNumber, value);
             case 100:
@@ -744,22 +744,24 @@ class MidyGM1 {
                 console.warn(`Unsupported Control change: controller=${controller} value=${value}`);
         }
     }
-    setModulation(channelNumber, modulation) {
+    updateModulation(channel) {
         const now = this.audioContext.currentTime;
-        const channel = this.channels[channelNumber];
-        channel.modulation = (modulation / 127) *
-            (channel.modulationDepthRange * 100);
         const activeNotes = this.getActiveNotes(channel, now);
         activeNotes.forEach((activeNote) => {
             if (activeNote.modLFO) {
-                activeNote.gainNode.gain.setValueAtTime(this.cbToRatio(activeNote.instrumentKey.modLfoToVolume) *
-                    channel.modulation, now);
+                const { gainNode, instrumentKey } = activeNote;
+                gainNode.gain.setValueAtTime(this.cbToRatio(instrumentKey.modLfoToVolume + channel.modulation), now);
             }
             else {
                 this.startModulation(channel, activeNote, now);
             }
         });
     }
+    setModulation(channelNumber, modulation) {
+        const channel = this.channels[channelNumber];
+        channel.modulation = (modulation / 127) * channel.modulationDepthRange;
+        this.updateModulation(channel);
+    }
     setVolume(channelNumber, volume) {
         const channel = this.channels[channelNumber];
         channel.volume = volume / 127;
@@ -782,6 +784,10 @@ class MidyGM1 {
         channel.expression = expression / 127;
         this.updateChannelGain(channel);
     }
+    dataEntryLSB(channelNumber, value) {
+        this.channels[channelNumber].dataLSB = value;
+        this.handleRPN(channelNumber, 0);
+    }
     updateChannelGain(channel) {
         const now = this.audioContext.currentTime;
         const volume = channel.volume * channel.expression;
@@ -831,13 +837,13 @@ class MidyGM1 {
         const rpn = channel.rpnMSB * 128 + channel.rpnLSB;
         switch (rpn) {
             case 0:
-                this.handlePitchBendRangeMessage(channelNumber);
+                this.handlePitchBendRangeRPN(channelNumber);
                 break;
             case 1:
-                this.handleFineTuningMessage(channelNumber);
+                this.handleFineTuningRPN(channelNumber);
                 break;
             case 2:
-                this.handleCoarseTuningMessage(channelNumber);
+                this.handleCoarseTuningRPN(channelNumber);
                 break;
             default:
                 console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
@@ -849,9 +855,8 @@ class MidyGM1 {
     setRPNLSB(channelNumber, value) {
         this.channels[channelNumber].rpnLSB = value;
     }
-    setDataEntry(channelNumber, value, isMSB) {
-        const channel = this.channels[channelNumber];
-        isMSB ? channel.dataMSB = value : channel.dataLSB = value;
+    dataEntryMSB(channelNumber, value) {
+        this.channels[channelNumber].dataMSB = value;
         this.handleRPN(channelNumber);
     }
     updateDetune(channel, detuneChange) {
@@ -865,7 +870,7 @@ class MidyGM1 {
                 .setValueAtTime(detune, now);
         });
     }
-    handlePitchBendRangeMessage(channelNumber) {
+    handlePitchBendRangeRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 99);
         const pitchBendRange = channel.dataMSB + channel.dataLSB / 100;
@@ -879,7 +884,7 @@ class MidyGM1 {
             channel.pitchBend * 100;
         this.updateDetune(channel, detuneChange);
     }
-    handleFineTuningMessage(channelNumber) {
+    handleFineTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 127);
         const fineTuning = (channel.dataMSB * 128 + channel.dataLSB - 8192) / 8192;
@@ -887,9 +892,12 @@ class MidyGM1 {
     }
     setFineTuning(channelNumber, fineTuning) {
         const channel = this.channels[channelNumber];
+        const prevFineTuning = channel.fineTuning;
         channel.fineTuning = fineTuning;
+        const detuneChange = channel.fineTuning - prevFineTuning;
+        this.updateDetune(channel, detuneChange);
     }
-    handleCoarseTuningMessage(channelNumber) {
+    handleCoarseTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitDataMSB(channel, 0, 127);
         const coarseTuning = channel.dataMSB - 64;
@@ -897,7 +905,10 @@ class MidyGM1 {
     }
     setCoarseTuning(channelNumber, coarseTuning) {
         const channel = this.channels[channelNumber];
-        channel.fineTuning = coarseTuning;
+        const prevCoarseTuning = channel.coarseTuning;
+        channel.coarseTuning = coarseTuning;
+        const detuneChange = channel.coarseTuning - prevCoarseTuning;
+        this.updateDetune(channel, detuneChange);
     }
     allSoundOff(channelNumber) {
         const now = this.audioContext.currentTime;
@@ -1024,9 +1035,9 @@ Object.defineProperty(MidyGM1, "channelSettings", {
         dataLSB: 0,
         program: 0,
         pitchBend: 0,
-        fineTuning: 0,
-        coarseTuning: 0,
-        modulationDepthRange: 0.5,
+        fineTuning: 0, // cb
+        coarseTuning: 0, // cb
+        modulationDepthRange: 0.5, // cb
     }
 });
 Object.defineProperty(MidyGM1, "effectSettings", {

package/script/midy-GM2.d.ts

@@ -237,6 +237,7 @@ export class MidyGM2 {
     setPitchBend(channelNumber: any, pitchBend: any): void;
     handleControlChange(channelNumber: any, controller: any, value: any): void | any[];
     setBankMSB(channelNumber: any, msb: any): void;
+    updateModulation(channel: any): void;
     setModulation(channelNumber: any, modulation: any): void;
     setPortamentoTime(channelNumber: any, portamentoTime: any): void;
     setVolume(channelNumber: any, volume: any): void;
@@ -247,26 +248,29 @@ export class MidyGM2 {
     setPan(channelNumber: any, pan: any): void;
     setExpression(channelNumber: any, expression: any): void;
     setBankLSB(channelNumber: any, lsb: any): void;
+    dataEntryLSB(channelNumber: any, value: any): void;
     updateChannelGain(channel: any): void;
     setSustainPedal(channelNumber: any, value: any): void;
     setPortamento(channelNumber: any, value: any): void;
-    setReverb(channelNumber: any, reverb: any): void;
-    setChorus(channelNumber: any, chorus: any): void;
+    setReverbSendLevel(channelNumber: any, reverb: any): void;
+    setChorusSendLevel(channelNumber: any, chorus: any): void;
     setSostenutoPedal(channelNumber: any, value: any): void;
     setSoftPedal(channelNumber: any, softPedal: any): void;
     limitData(channel: any, minMSB: any, maxMSB: any, minLSB: any, maxLSB: any): void;
     limitDataMSB(channel: any, minMSB: any, maxMSB: any): void;
-    handleRPN(channelNumber: any, value: any): void;
+    handleRPN(channelNumber: any): void;
     setRPNMSB(channelNumber: any, value: any): void;
     setRPNLSB(channelNumber: any, value: any): void;
-    setDataEntry(channelNumber: any, value: any, isMSB: any): void;
+    dataEntryMSB(channelNumber: any, value: any): void;
     updateDetune(channel: any, detuneChange: any): void;
-    handlePitchBendRangeMessage(channelNumber: any): void;
+    handlePitchBendRangeRPN(channelNumber: any): void;
     setPitchBendRange(channelNumber: any, pitchBendRange: any): void;
-    handleFineTuningMessage(channelNumber: any): void;
+    handleFineTuningRPN(channelNumber: any): void;
     setFineTuning(channelNumber: any, fineTuning: any): void;
-    handleCoarseTuningMessage(channelNumber: any): void;
+    handleCoarseTuningRPN(channelNumber: any): void;
     setCoarseTuning(channelNumber: any, coarseTuning: any): void;
+    handleModulationDepthRangeRPN(channelNumber: any): void;
+    setModulationDepthRange(channelNumber: any, modulationDepthRange: any): void;
     allSoundOff(channelNumber: any): any[];
     resetAllControllers(channelNumber: any): void;
     allNotesOff(channelNumber: any): any[];

package/script/midy-GM2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"AAuBA;IAwBE;;;;;;;;;;;;;;;;;MAiBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAtED,qBAAmB;IACnB,kBAAc;IACd,qBAAmB;IACnB,yBAAqB;IACrB,2BAAuB;IACvB,cAAa;IACb,cAAa;IACb,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IA4ChB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;MAqBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAcC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EAkDC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgGC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED;;;;MAoCC;IAED;;;;;MAqCC;IAED,sDA6BC;IAED,2BAEC;IAED,4BAEC;IAED,sCAKC;IAED,mFAGC;IAED,iDAiBC;IAED,iDAiCC;IAED,0DAmBC;IAED,wHAiCC;IAED,gDAQC;IAED,kGAgCC;IAED,0EAGC;IAED,sIAoDC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,wFAmBC;IAED,4DAIC;IAED,+DAcC;IAED,qEAGC;IAED,uDAOC;IAED,mFAuDC;IAED,+CAEC;IAED,yDAiBC;IAED,iEAEC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,+CAEC;IAED,sCAUC;IAED,sDAMC;IAED,oDAEC;IAED,iDASC;IAED,iDAIC;IAED,wDAWC;IAED,uDAGC;IAED,kFAeC;IAED,2DAMC;IAED,gDAqBC;IAED,gDAEC;IAED,gDAEC;IAED,+DAIC;IAED,oDAUC;IAED,sDAKC;IAED,iEAOC;IAED,kDAKC;IAED,yDAGC;IAED,oDAKC;IAED,6DAGC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,gBAEC;IAED,eAEC;IAED,eAEC;IAED,eAEC;IAED,4DAmBC;IAED,oBAQC;IAED,oBAQC;IAED,yDAgDC;IAED,yCAGC;IAED,mCAQC;IAED,6CAGC;IAED,2CAMC;IAED,+CAGC;IAED,+CAMC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AA17CD;IASE,gFAKC;IAbD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}
+{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"AAuBA;IAwBE;;;;;;;;;;;;;;;;;MAiBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAtED,qBAAmB;IACnB,kBAAc;IACd,qBAAmB;IACnB,yBAAqB;IACrB,2BAAuB;IACvB,cAAa;IACb,cAAa;IACb,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IA4ChB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;MAqBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAcC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EAkDC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgGC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED;;;;MAoCC;IAED;;;;;MAqCC;IAED,sDA6BC;IAED,2BAEC;IAED,4BAEC;IAED,sCAKC;IAED,mFAGC;IAED,iDAiBC;IAED,iDAiCC;IAED,0DAmBC;IAED,wHAiCC;IAED,gDAQC;IAED,kGAgCC;IAED,0EAGC;IAED,sIAoDC;IAED,0FAGC;IAED,kEAeC;IAED,oEAYC;IAED,wFAmBC;IAED,4DAIC;IAED,+DAcC;IAED,qEAGC;IAED,uDAOC;IAED,mFAuDC;IAED,+CAEC;IAED,qCAcC;IAED,yDAIC;IAED,iEAEC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,+CAEC;IAED,mDAGC;IAED,sCAUC;IAED,sDAMC;IAED,oDAEC;IAED,0DASC;IAED,0DAIC;IAED,wDAWC;IAED,uDAGC;IAED,kFAeC;IAED,2DAMC;IAED,oCAqBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,8CAKC;IAED,yDAMC;IAED,gDAKC;IAED,6DAMC;IAED,wDAKC;IAED,6EAKC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,gBAEC;IAED,eAEC;IAED,eAEC;IAED,eAEC;IAED,4DAmBC;IAED,oBAQC;IAED,oBAQC;IAED,yDAgDC;IAED,yCAGC;IAED,mCAQC;IAED,6CAGC;IAED,2CAMC;IAED,+CAGC;IAED,+CAMC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAr9CD;IASE,gFAKC;IAbD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}