@marmooo/midy 0.0.6 → 0.0.8

package/script/midy-GM2.d.ts

@@ -73,8 +73,8 @@ export class MidyGM2 {
             lfoFilterDepth: number;
             lfoAmplitudeDepth: number;
         };
-        gainNode: any;
-        pannerNode: any;
+        gainL: any;
+        gainR: any;
         reverbEffect: {
             convolverNode: any;
             dryGain: any;
@@ -117,8 +117,8 @@ export class MidyGM2 {
     loadSoundFont(soundFontUrl: any): Promise<void>;
     loadMIDI(midiUrl: any): Promise<void>;
     setChannelAudioNodes(audioContext: any): {
-        gainNode: any;
-        pannerNode: any;
+        gainL: any;
+        gainR: any;
         reverbEffect: {
             convolverNode: any;
             dryGain: any;
@@ -142,8 +142,8 @@ export class MidyGM2 {
             lfoFilterDepth: number;
             lfoAmplitudeDepth: number;
         };
-        gainNode: any;
-        pannerNode: any;
+        gainL: any;
+        gainR: any;
         reverbEffect: {
             convolverNode: any;
             dryGain: any;
@@ -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,18 +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): void;
     setRPNMSB(channelNumber: any, value: any): void;
     setRPNLSB(channelNumber: any, value: any): void;
-    setDataEntry(channelNumber: any, value: any, isMSB: any): void;
-    handlePitchBendRangeMessage(channelNumber: any, dataMSB: any, dataLSB: any): void;
+    dataEntryMSB(channelNumber: any, value: any): void;
+    updateDetune(channel: any, detuneChange: any): void;
+    handlePitchBendRangeRPN(channelNumber: any): void;
     setPitchBendRange(channelNumber: any, pitchBendRange: any): void;
+    handleFineTuningRPN(channelNumber: any): void;
+    setFineTuning(channelNumber: any, fineTuning: 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;;;;;;;;;;;;;;MAoBC;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,sDA2BC;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,uDAeC;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,gDAEC;IAED,gDAEC;IAED,+DA0BC;IAED,kFAGC;IAED,iEAeC;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;AAv4CD;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"}

package/script/midy-GM2.js

@@ -78,13 +78,13 @@ class MidyGM2 {
             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,
@@ -228,22 +228,23 @@ class MidyGM2 {
         this.totalTime = this.calcTotalTime();
     }
     setChannelAudioNodes(audioContext) {
-        const gainNode = new GainNode(audioContext, {
-            gain: MidyGM2.channelSettings.volume,
-        });
-        const pannerNode = new StereoPannerNode(audioContext, {
-            pan: MidyGM2.channelSettings.pan,
-        });
+        const { gainLeft, gainRight } = this.panToGain(MidyGM2.channelSettings.pan);
+        const gainL = new GainNode(audioContext, { gain: gainLeft });
+        const gainR = new GainNode(audioContext, { gain: gainRight });
+        const merger = new ChannelMergerNode(audioContext, { numberOfInputs: 2 });
+        gainL.connect(merger, 0, 0);
+        gainR.connect(merger, 0, 1);
+        merger.connect(this.masterGain);
         const reverbEffect = this.createReverbEffect(audioContext);
         const chorusEffect = this.createChorusEffect(audioContext);
         chorusEffect.lfo.start();
-        reverbEffect.dryGain.connect(pannerNode);
-        reverbEffect.wetGain.connect(pannerNode);
-        pannerNode.connect(gainNode);
-        gainNode.connect(this.masterGain);
+        reverbEffect.dryGain.connect(gainL);
+        reverbEffect.dryGain.connect(gainR);
+        reverbEffect.wetGain.connect(gainL);
+        reverbEffect.wetGain.connect(gainR);
         return {
-            gainNode,
-            pannerNode,
+            gainL,
+            gainR,
             reverbEffect,
             chorusEffect,
         };
@@ -647,14 +648,16 @@ class MidyGM2 {
     connectNoteEffects(channel, gainNode) {
         if (channel.reverb === 0) {
             if (channel.chorus === 0) { // no effect
-                gainNode.connect(channel.pannerNode);
+                gainNode.connect(channel.gainL);
+                gainNode.connect(channel.gainR);
             }
             else { // chorus
                 channel.chorusEffect.delayNodes.forEach((delayNode) => {
                     gainNode.connect(delayNode);
                 });
                 channel.chorusEffect.chorusGains.forEach((chorusGain) => {
-                    chorusGain.connect(channel.pannerNode);
+                    chorusGain.connect(channel.gainL);
+                    chorusGain.connect(channel.gainR);
                 });
             }
         }
@@ -935,20 +938,12 @@ class MidyGM2 {
         this.setPitchBend(channelNumber, pitchBend);
     }
     setPitchBend(channelNumber, pitchBend) {
-        const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const prevPitchBend = channel.pitchBend;
         channel.pitchBend = (pitchBend - 8192) / 8192;
         const detuneChange = (channel.pitchBend - prevPitchBend) *
             channel.pitchBendRange * 100;
-        const activeNotes = this.getActiveNotes(channel, now);
-        activeNotes.forEach((activeNote) => {
-            const { bufferSource } = activeNote;
-            const detune = bufferSource.detune.value + detuneChange;
-            bufferSource.detune
-                .cancelScheduledValues(now)
-                .setValueAtTime(detune, now);
-        });
+        this.updateDetune(channel, detuneChange);
     }
     handleControlChange(channelNumber, controller, value) {
         switch (controller) {
@@ -959,7 +954,7 @@ class MidyGM2 {
             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:
@@ -969,7 +964,7 @@ class MidyGM2 {
             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:
@@ -979,13 +974,13 @@ class MidyGM2 {
             case 67:
                 return this.setSoftPedal(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 100:
-                return this.setRPNMSB(channelNumber, value);
-            case 101:
                 return this.setRPNLSB(channelNumber, value);
+            case 101:
+                return this.setRPNMSB(channelNumber, value);
             case 120:
                 return this.allSoundOff(channelNumber);
             case 121:
@@ -1007,22 +1002,24 @@ class MidyGM2 {
     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;
     }
@@ -1051,6 +1048,10 @@ class MidyGM2 {
     setBankLSB(channelNumber, lsb) {
         this.channels[channelNumber].bankLSB = lsb;
     }
+    dataEntryLSB(channelNumber, value) {
+        this.channels[channelNumber].dataLSB = value;
+        this.handleRPN(channelNumber);
+    }
     updateChannelGain(channel) {
         const now = this.audioContext.currentTime;
         const volume = channel.volume * channel.expression;
@@ -1072,7 +1073,7 @@ class MidyGM2 {
     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;
@@ -1082,7 +1083,7 @@ class MidyGM2 {
         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;
@@ -1104,44 +1105,64 @@ class MidyGM2 {
         const channel = this.channels[channelNumber];
         channel.softPedal = softPedal / 127;
     }
-    setRPNMSB(channelNumber, value) {
-        this.channels[channelNumber].rpnMSB = value;
+    limitData(channel, minMSB, maxMSB, minLSB, maxLSB) {
+        if (maxLSB < channel.dataLSB) {
+            channel.dataMSB++;
+            channel.dataLSB = minLSB;
+        }
+        else if (channel.dataLSB < 0) {
+            channel.dataMSB--;
+            channel.dataLSB = maxLSB;
+        }
+        if (maxMSB < channel.dataMSB) {
+            channel.dataMSB = maxMSB;
+            channel.dataLSB = maxLSB;
+        }
+        else if (channel.dataMSB < 0) {
+            channel.dataMSB = minMSB;
+            channel.dataLSB = minLSB;
+        }
     }
-    setRPNLSB(channelNumber, value) {
-        this.channels[channelNumber].rpnLSB = value;
+    limitDataMSB(channel, minMSB, maxMSB) {
+        if (maxMSB < channel.dataMSB) {
+            channel.dataMSB = maxMSB;
+        }
+        else if (channel.dataMSB < 0) {
+            channel.dataMSB = minMSB;
+        }
     }
-    setDataEntry(channelNumber, value, isMSB) {
+    handleRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         const rpn = channel.rpnMSB * 128 + channel.rpnLSB;
-        isMSB ? channel.dataMSB = value : channel.dataLSB = value;
-        const { dataMSB, dataLSB } = channel;
         switch (rpn) {
             case 0:
-                return this.handlePitchBendRangeMessage(channelNumber, dataMSB, dataLSB);
+                this.handlePitchBendRangeRPN(channelNumber);
+                break;
             case 1:
-                channel.fineTuning = (dataMSB * 128 + dataLSB - 8192) / 8192;
+                this.handleFineTuningRPN(channelNumber);
                 break;
             case 2:
-                channel.coarseTuning = dataMSB - 64;
+                this.handleCoarseTuningRPN(channelNumber);
                 break;
             case 5:
-                channel.modulationDepthRange = dataMSB + dataLSB / 128;
+                this.handleModulationDepthRangeRPN(channelNumber);
                 break;
             default:
                 console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
         }
     }
-    handlePitchBendRangeMessage(channelNumber, dataMSB, dataLSB) {
-        const pitchBendRange = dataMSB + dataLSB / 100;
-        this.setPitchBendRange(channelNumber, pitchBendRange);
+    setRPNMSB(channelNumber, value) {
+        this.channels[channelNumber].rpnMSB = value;
     }
-    setPitchBendRange(channelNumber, pitchBendRange) {
+    setRPNLSB(channelNumber, value) {
+        this.channels[channelNumber].rpnLSB = value;
+    }
+    dataEntryMSB(channelNumber, value) {
+        this.channels[channelNumber].dataMSB = value;
+        this.handleRPN(channelNumber);
+    }
+    updateDetune(channel, detuneChange) {
         const now = this.audioContext.currentTime;
-        const channel = this.channels[channelNumber];
-        const prevPitchBendRange = channel.pitchBendRange;
-        channel.pitchBendRange = pitchBendRange;
-        const detuneChange = (channel.pitchBendRange - prevPitchBendRange) *
-            channel.pitchBend * 100;
         const activeNotes = this.getActiveNotes(channel, now);
         activeNotes.forEach((activeNote) => {
             const { bufferSource } = activeNote;
@@ -1151,6 +1172,58 @@ class MidyGM2 {
                 .setValueAtTime(detune, now);
         });
     }
+    handlePitchBendRangeRPN(channelNumber) {
+        const channel = this.channels[channelNumber];
+        this.limitData(channel, 0, 127, 0, 99);
+        const pitchBendRange = channel.dataMSB + channel.dataLSB / 100;
+        this.setPitchBendRange(channelNumber, pitchBendRange);
+    }
+    setPitchBendRange(channelNumber, pitchBendRange) {
+        const channel = this.channels[channelNumber];
+        const prevPitchBendRange = channel.pitchBendRange;
+        channel.pitchBendRange = pitchBendRange;
+        const detuneChange = (channel.pitchBendRange - prevPitchBendRange) *
+            channel.pitchBend * 100;
+        this.updateDetune(channel, detuneChange);
+    }
+    handleFineTuningRPN(channelNumber) {
+        const channel = this.channels[channelNumber];
+        this.limitData(channel, 0, 127, 0, 127);
+        const fineTuning = (channel.dataMSB * 128 + channel.dataLSB - 8192) / 8192;
+        this.setFineTuning(channelNumber, fineTuning);
+    }
+    setFineTuning(channelNumber, fineTuning) {
+        const channel = this.channels[channelNumber];
+        const prevFineTuning = channel.fineTuning;
+        channel.fineTuning = fineTuning;
+        const detuneChange = channel.fineTuning - prevFineTuning;
+        this.updateDetune(channel, detuneChange);
+    }
+    handleCoarseTuningRPN(channelNumber) {
+        const channel = this.channels[channelNumber];
+        this.limitDataMSB(channel, 0, 127);
+        const coarseTuning = channel.dataMSB - 64;
+        this.setFineTuning(channelNumber, coarseTuning);
+    }
+    setCoarseTuning(channelNumber, coarseTuning) {
+        const channel = this.channels[channelNumber];
+        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;
         const channel = this.channels[channelNumber];
@@ -1240,9 +1313,9 @@ class MidyGM2 {
                 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:
@@ -1354,7 +1427,7 @@ Object.defineProperty(MidyGM2, "channelSettings", {
     value: {
         currentBufferSource: null,
         volume: 100 / 127,
-        pan: 0,
+        pan: 64,
         portamentoTime: 0,
         reverb: 0,
         chorus: 0,
@@ -1365,9 +1438,9 @@ Object.defineProperty(MidyGM2, "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(MidyGM2, "effectSettings", {

package/script/midy-GMLite.d.ts

@@ -124,6 +124,7 @@ export class MidyGMLite {
     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): {
@@ -132,12 +133,15 @@ export class MidyGMLite {
     };
     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;
+    handleRPN(channelNumber: any): void;
     setRPNMSB(channelNumber: any, value: any): void;
     setRPNLSB(channelNumber: any, value: any): void;
-    setDataEntry(channelNumber: any, value: any, isMSB: any): void;
-    handlePitchBendRangeMessage(channelNumber: any, dataMSB: any, dataLSB: any): void;
+    dataEntryMSB(channelNumber: any, value: any): void;
+    updateDetune(channel: any, detuneChange: any): void;
+    handlePitchBendRangeRPN(channelNumber: any): void;
     setPitchBendRange(channelNumber: any, pitchBendRange: any): void;
     allSoundOff(channelNumber: any): any[];
     resetAllControllers(channelNumber: any): void;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAqBA;IAmBE;;;;;;;;;MASE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA5CD,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;IAuBhB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;MAcC;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,sDAEC;IAED,2BAEC;IAED,4BAEC;IAED,yCAEC;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,uDAeC;IAED,mFA+BC;IAED,yDAiBC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,sCAUC;IAED,sDAMC;IAED,gDAEC;IAED,gDAEC;IAED,+DAiBC;IAED,kFAGC;IAED,iEAeC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAl/BD;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-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAqBA;IAmBE;;;;;;;;;MASE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IA5CD,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;IAuBhB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;MAcC;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,yCAEC;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,oCAYC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAUC;IAED,kDAKC;IAED,iEAOC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAx/BD;IAOE,gFAKC;IAXD,kBAAa;IACb,cAAS;IACT,gBAAW;IACX,YAAO;IACP,gBAAW;IAGT,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}

package/script/midy-GMLite.js

@@ -495,7 +495,8 @@ class MidyGMLite {
         return noteList[0];
     }
     connectNoteEffects(channel, gainNode) {
-        gainNode.connect(channel.pannerNode);
+        gainNode.connect(channel.gainL);
+        gainNode.connect(channel.gainR);
     }
     cbToRatio(cb) {
         return Math.pow(10, cb / 200);
@@ -705,27 +706,19 @@ class MidyGMLite {
         this.setPitchBend(channelNumber, pitchBend);
     }
     setPitchBend(channelNumber, pitchBend) {
-        const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const prevPitchBend = channel.pitchBend;
         channel.pitchBend = (pitchBend - 8192) / 8192;
         const detuneChange = (channel.pitchBend - prevPitchBend) *
             channel.pitchBendRange * 100;
-        const activeNotes = this.getActiveNotes(channel, now);
-        activeNotes.forEach((activeNote) => {
-            const { bufferSource } = activeNote;
-            const detune = bufferSource.detune.value + detuneChange;
-            bufferSource.detune
-                .cancelScheduledValues(now)
-                .setValueAtTime(detune, now);
-        });
+        this.updateDetune(channel, detuneChange);
     }
     handleControlChange(channelNumber, controller, value) {
         switch (controller) {
             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:
@@ -733,13 +726,13 @@ class MidyGMLite {
             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:
-                return this.setRPNMSB(channelNumber, value);
-            case 101:
                 return this.setRPNLSB(channelNumber, value);
+            case 101:
+                return this.setRPNMSB(channelNumber, value);
             case 120:
                 return this.allSoundOff(channelNumber);
             case 121:
@@ -750,22 +743,24 @@ class MidyGMLite {
                 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;
@@ -788,6 +783,10 @@ class MidyGMLite {
         channel.expression = expression / 127;
         this.updateChannelGain(channel);
     }
+    dataEntryLSB(channelNumber, value) {
+        this.channels[channelNumber].dataLSB = value;
+        this.handleRPN(channelNumber);
+    }
     updateChannelGain(channel) {
         const now = this.audioContext.currentTime;
         const volume = channel.volume * channel.expression;
@@ -806,35 +805,29 @@ class MidyGMLite {
             this.releaseSustainPedal(channelNumber, value);
         }
     }
-    setRPNMSB(channelNumber, value) {
-        this.channels[channelNumber].rpnMSB = value;
-    }
-    setRPNLSB(channelNumber, value) {
-        this.channels[channelNumber].rpnLSB = value;
-    }
-    setDataEntry(channelNumber, value, isMSB) {
+    handleRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         const rpn = channel.rpnMSB * 128 + channel.rpnLSB;
-        isMSB ? channel.dataMSB = value : channel.dataLSB = value;
-        const { dataMSB, dataLSB } = channel;
         switch (rpn) {
             case 0:
-                return this.handlePitchBendRangeMessage(channelNumber, dataMSB, dataLSB);
+                this.handlePitchBendRangeRPN(channelNumber);
+                break;
             default:
                 console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
         }
     }
-    handlePitchBendRangeMessage(channelNumber, dataMSB, dataLSB) {
-        const pitchBendRange = dataMSB + dataLSB / 100;
-        this.setPitchBendRange(channelNumber, pitchBendRange);
+    setRPNMSB(channelNumber, value) {
+        this.channels[channelNumber].rpnMSB = value;
     }
-    setPitchBendRange(channelNumber, pitchBendRange) {
+    setRPNLSB(channelNumber, value) {
+        this.channels[channelNumber].rpnLSB = value;
+    }
+    dataEntryMSB(channelNumber, value) {
+        this.channels[channelNumber].dataMSB = value;
+        this.handleRPN(channelNumber);
+    }
+    updateDetune(channel, detuneChange) {
         const now = this.audioContext.currentTime;
-        const channel = this.channels[channelNumber];
-        const prevPitchBendRange = channel.pitchBendRange;
-        channel.pitchBendRange = pitchBendRange;
-        const detuneChange = (channel.pitchBendRange - prevPitchBendRange) *
-            channel.pitchBend * 100;
         const activeNotes = this.getActiveNotes(channel, now);
         activeNotes.forEach((activeNote) => {
             const { bufferSource } = activeNote;
@@ -844,6 +837,20 @@ class MidyGMLite {
                 .setValueAtTime(detune, now);
         });
     }
+    handlePitchBendRangeRPN(channelNumber) {
+        const channel = this.channels[channelNumber];
+        this.limitData(channel, 0, 127, 0, 99);
+        const pitchBendRange = channel.dataMSB + channel.dataLSB / 100;
+        this.setPitchBendRange(channelNumber, pitchBendRange);
+    }
+    setPitchBendRange(channelNumber, pitchBendRange) {
+        const channel = this.channels[channelNumber];
+        const prevPitchBendRange = channel.pitchBendRange;
+        channel.pitchBendRange = pitchBendRange;
+        const detuneChange = (channel.pitchBendRange - prevPitchBendRange) *
+            channel.pitchBend * 100;
+        this.updateDetune(channel, detuneChange);
+    }
     allSoundOff(channelNumber) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
@@ -969,7 +976,7 @@ Object.defineProperty(MidyGMLite, "channelSettings", {
         dataLSB: 0,
         program: 0,
         pitchBend: 0,
-        modulationDepthRange: 0.5,
+        modulationDepthRange: 0.5, // cb
     }
 });
 Object.defineProperty(MidyGMLite, "effectSettings", {