@marmooo/midy 0.0.6 → 0.0.7

package/script/midy-GM2.js

@@ -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) {
@@ -983,9 +978,9 @@ class MidyGM2 {
             case 93:
                 return this.setChorus(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:
@@ -1104,44 +1099,65 @@ 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, value) {
         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);
+                channel.dataLSB += value;
+                this.handlePitchBendRangeMessage(channelNumber);
+                break;
             case 1:
-                channel.fineTuning = (dataMSB * 128 + dataLSB - 8192) / 8192;
+                channel.dataLSB += value;
+                this.handleFineTuningMessage(channelNumber);
                 break;
             case 2:
-                channel.coarseTuning = dataMSB - 64;
-                break;
-            case 5:
-                channel.modulationDepthRange = dataMSB + dataLSB / 128;
+                channel.dataMSB += value;
+                this.handleCoarseTuningMessage(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) {
-        const now = this.audioContext.currentTime;
+    setRPNLSB(channelNumber, value) {
+        this.channels[channelNumber].rpnLSB = value;
+    }
+    setDataEntry(channelNumber, value, isMSB) {
         const channel = this.channels[channelNumber];
-        const prevPitchBendRange = channel.pitchBendRange;
-        channel.pitchBendRange = pitchBendRange;
-        const detuneChange = (channel.pitchBendRange - prevPitchBendRange) *
-            channel.pitchBend * 100;
+        isMSB ? channel.dataMSB = value : channel.dataLSB = value;
+        this.handleRPN(channelNumber);
+    }
+    updateDetune(channel, detuneChange) {
+        const now = this.audioContext.currentTime;
         const activeNotes = this.getActiveNotes(channel, now);
         activeNotes.forEach((activeNote) => {
             const { bufferSource } = activeNote;
@@ -1151,6 +1167,40 @@ class MidyGM2 {
                 .setValueAtTime(detune, now);
         });
     }
+    handlePitchBendRangeMessage(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);
+    }
+    handleFineTuningMessage(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];
+        channel.fineTuning = fineTuning;
+    }
+    handleCoarseTuningMessage(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];
+        channel.fineTuning = coarseTuning;
+    }
     allSoundOff(channelNumber) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];

package/script/midy-GMLite.d.ts

@@ -134,10 +134,12 @@ export class MidyGMLite {
     setExpression(channelNumber: any, expression: 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;
+    updateDetune(channel: any, detuneChange: any): void;
+    handlePitchBendRangeMessage(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,yDAiBC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,sCAUC;IAED,sDAMC;IAED,oCAYC;IAED,gDAEC;IAED,gDAEC;IAED,+DAIC;IAED,oDAUC;IAED,sDAKC;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;AAl/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,20 +706,12 @@ 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) {
@@ -737,9 +730,9 @@ class MidyGMLite {
             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:
@@ -806,6 +799,17 @@ class MidyGMLite {
             this.releaseSustainPedal(channelNumber, value);
         }
     }
+    handleRPN(channelNumber) {
+        const channel = this.channels[channelNumber];
+        const rpn = channel.rpnMSB * 128 + channel.rpnLSB;
+        switch (rpn) {
+            case 0:
+                this.handlePitchBendRangeMessage(channelNumber);
+                break;
+            default:
+                console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
+        }
+    }
     setRPNMSB(channelNumber, value) {
         this.channels[channelNumber].rpnMSB = value;
     }
@@ -814,27 +818,11 @@ class MidyGMLite {
     }
     setDataEntry(channelNumber, value, isMSB) {
         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);
-            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);
+        this.handleRPN(channelNumber);
     }
-    setPitchBendRange(channelNumber, pitchBendRange) {
+    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 +832,20 @@ class MidyGMLite {
                 .setValueAtTime(detune, now);
         });
     }
+    handlePitchBendRangeMessage(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];

package/script/midy.d.ts

@@ -284,13 +284,21 @@ export class Midy {
     setVibratoRate(channelNumber: any, vibratoRate: any): void;
     setVibratoDepth(channelNumber: any, vibratoDepth: any): void;
     setVibratoDelay(channelNumber: any, vibratoDelay: 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;
     incrementRPNValue(channelNumber: any): void;
     decrementRPNValue(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;
+    updateDetune(channel: any, detuneChange: any): void;
+    handlePitchBendRangeMessage(channelNumber: any): void;
     setPitchBendRange(channelNumber: any, pitchBendRange: any): void;
+    handleFineTuningMessage(channelNumber: any): void;
+    setFineTuning(channelNumber: any, fineTuning: any): void;
+    handleCoarseTuningMessage(channelNumber: any): void;
+    setCoarseTuning(channelNumber: any, coarseTuning: any): void;
     allSoundOff(channelNumber: any): any[];
     resetAllControllers(channelNumber: any): void;
     allNotesOff(channelNumber: any): any[];

package/script/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,sDA2BC;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,uDAeC;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,4CAkBC;IAED,4CAkBC;IAED,gDAEC;IAED,gDAEC;IAGD,+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;AAxgDD;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,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"}

package/script/midy.js

@@ -654,14 +654,16 @@ class Midy {
     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);
                 });
             }
         }
@@ -980,20 +982,12 @@ class Midy {
         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) {
@@ -1034,14 +1028,14 @@ class Midy {
                 return this.setReverb(channelNumber, value);
             case 93:
                 return this.setChorus(channelNumber, value);
-            case 96:
+            case 96: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp18.pdf
                 return incrementRPNValue(channelNumber);
-            case 97:
+            case 97: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp18.pdf
                 return decrementRPNValue(channelNumber);
             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:
@@ -1178,39 +1172,58 @@ class Midy {
         const channel = this.channels[channelNumber];
         channel.vibratoDelay = vibratoDelay / 127 * 5; // 0-5sec
     }
-    incrementRPNValue(channelNumber) {
+    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;
+        }
+    }
+    limitDataMSB(channel, minMSB, maxMSB) {
+        if (maxMSB < channel.dataMSB) {
+            channel.dataMSB = maxMSB;
+        }
+        else if (channel.dataMSB < 0) {
+            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.pitchBendRange = Math.min(1, channel.pitchBendRange + 1);
+                channel.dataLSB += value;
+                this.handlePitchBendRangeMessage(channelNumber);
                 break;
             case 1:
-                channel.fineTuning = Math.min(1, channel.fineTuning + 1);
+                channel.dataLSB += value;
+                this.handleFineTuningMessage(channelNumber);
                 break;
             case 2:
-                channel.coarseTuning = Math.min(88, channel.coarseTuning + 1);
+                channel.dataMSB += value;
+                this.handleCoarseTuningMessage(channelNumber);
                 break;
             default:
                 console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
         }
     }
+    incrementRPNValue(channelNumber) {
+        this.handleRPN(channelNumber, 1);
+    }
     decrementRPNValue(channelNumber) {
-        const channel = this.channels[channelNumber];
-        const rpn = channel.rpnMSB * 128 + channel.rpnLSB;
-        switch (rpn) {
-            case 0:
-                channel.pitchBendRange = Math.max(-1, channel.pitchBendRange - 1);
-                break;
-            case 1:
-                channel.fineTuning = Math.max(-1, channel.fineTuning - 1);
-                break;
-            case 2:
-                channel.coarseTuning = Math.max(40, channel.coarseTuning - 1);
-                break;
-            default:
-                console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB}, LSB=${channel.rpnLSB}.`);
-        }
+        this.handleRPN(channelNumber, -1);
     }
     setRPNMSB(channelNumber, value) {
         this.channels[channelNumber].rpnMSB = value;
@@ -1218,39 +1231,13 @@ class Midy {
     setRPNLSB(channelNumber, value) {
         this.channels[channelNumber].rpnLSB = value;
     }
-    // TODO: support 3-4?
     setDataEntry(channelNumber, value, isMSB) {
         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);
-            case 1:
-                channel.fineTuning = (dataMSB * 128 + dataLSB - 8192) / 8192;
-                break;
-            case 2:
-                channel.coarseTuning = dataMSB - 64;
-                break;
-            case 5:
-                channel.modulationDepthRange = dataMSB + dataLSB / 128;
-                break;
-            default:
-                console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
-        }
+        this.handleRPN(channelNumber, 0);
     }
-    handlePitchBendRangeMessage(channelNumber, dataMSB, dataLSB) {
-        const pitchBendRange = dataMSB + dataLSB / 100;
-        this.setPitchBendRange(channelNumber, pitchBendRange);
-    }
-    setPitchBendRange(channelNumber, pitchBendRange) {
+    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;
@@ -1260,6 +1247,40 @@ class Midy {
                 .setValueAtTime(detune, now);
         });
     }
+    handlePitchBendRangeMessage(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);
+    }
+    handleFineTuningMessage(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];
+        channel.fineTuning = fineTuning;
+    }
+    handleCoarseTuningMessage(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];
+        channel.fineTuning = coarseTuning;
+    }
     allSoundOff(channelNumber) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
@@ -1331,8 +1352,8 @@ class Midy {
             channel.bankLSB = 0;
             channel.bank = 0;
         });
-        this.channels[9].bankMSB = 120;
-        this.channels[9].bank = 120 * 128;
+        this.channels[9].bankMSB = 1;
+        this.channels[9].bank = 128;
     }
     GM2SystemOn() {
         this.channels.forEach((channel) => {