@marmooo/midy 0.0.6 → 0.0.8

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,
@@ -651,14 +651,16 @@ export 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);
                 });
             }
         }
@@ -746,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),
@@ -977,20 +979,12 @@ export 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) {
@@ -1001,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:
@@ -1011,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:
@@ -1028,17 +1022,17 @@ 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);
-            case 96:
-                return incrementRPNValue(channelNumber);
-            case 97:
-                return decrementRPNValue(channelNumber);
+                return this.setChorusSendLevel(channelNumber, value);
+            case 96: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp18.pdf
+                return this.dataIncrement(channelNumber);
+            case 97: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp18.pdf
+                return this.dataDecrement(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:
@@ -1060,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;
     }
@@ -1104,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;
@@ -1125,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;
@@ -1135,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;
@@ -1175,79 +1175,74 @@ export class Midy {
         const channel = this.channels[channelNumber];
         channel.vibratoDelay = vibratoDelay / 127 * 5; // 0-5sec
     }
-    incrementRPNValue(channelNumber) {
-        const channel = this.channels[channelNumber];
-        const rpn = channel.rpnMSB * 128 + channel.rpnLSB;
-        switch (rpn) {
-            case 0:
-                channel.pitchBendRange = Math.min(1, channel.pitchBendRange + 1);
-                break;
-            case 1:
-                channel.fineTuning = Math.min(1, channel.fineTuning + 1);
-                break;
-            case 2:
-                channel.coarseTuning = Math.min(88, channel.coarseTuning + 1);
-                break;
-            default:
-                console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
+    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;
         }
     }
-    decrementRPNValue(channelNumber) {
+    handleRPN(channelNumber, value) {
         const channel = this.channels[channelNumber];
         const rpn = channel.rpnMSB * 128 + channel.rpnLSB;
         switch (rpn) {
             case 0:
-                channel.pitchBendRange = Math.max(-1, channel.pitchBendRange - 1);
+                channel.dataLSB += value;
+                this.handlePitchBendRangeRPN(channelNumber);
                 break;
             case 1:
-                channel.fineTuning = Math.max(-1, channel.fineTuning - 1);
+                channel.dataLSB += value;
+                this.handleFineTuningRPN(channelNumber);
                 break;
             case 2:
-                channel.coarseTuning = Math.max(40, channel.coarseTuning - 1);
+                channel.dataMSB += value;
+                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}.`);
+                console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
         }
     }
+    dataIncrement(channelNumber) {
+        this.handleRPN(channelNumber, 1);
+    }
+    dataDecrement(channelNumber) {
+        this.handleRPN(channelNumber, -1);
+    }
     setRPNMSB(channelNumber, value) {
         this.channels[channelNumber].rpnMSB = value;
     }
     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}`);
-        }
+    dataEntryMSB(channelNumber, value) {
+        this.channels[channelNumber].dataMSB = value;
+        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;
@@ -1257,6 +1252,58 @@ export class Midy {
                 .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];
@@ -1328,8 +1375,8 @@ export 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) => {
@@ -1346,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:
@@ -1473,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.6",
+  "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,13 +139,22 @@ 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;
+    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;
     allSoundOff(channelNumber: any): any[];
     resetAllControllers(channelNumber: any): void;
     allNotesOff(channelNumber: any): any[];

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,sDAEC;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,uDAeC;IAED,mFA+BC;IAED,yDAiBC;IAED,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,sCAUC;IAED,sDAMC;IAED,gDAEC;IAED,gDAEC;IAED,+DAuBC;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;AAz/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-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

@@ -495,7 +495,8 @@ class MidyGM1 {
         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);
@@ -706,27 +707,19 @@ class MidyGM1 {
         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:
@@ -734,13 +727,13 @@ 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:
-                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:
@@ -751,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;
@@ -789,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;
@@ -807,41 +806,61 @@ class MidyGM1 {
             this.releaseSustainPedal(channelNumber, value);
         }
     }
-    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;
             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;
@@ -851,6 +870,46 @@ class MidyGM1 {
                 .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);
+    }
     allSoundOff(channelNumber) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
@@ -976,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", {