@marmooo/midy 0.0.5 → 0.0.6

package/esm/midy-GMLite.js

@@ -183,17 +183,16 @@ export class MidyGMLite {
         this.totalTime = this.calcTotalTime();
     }
     setChannelAudioNodes(audioContext) {
-        const gainNode = new GainNode(audioContext, {
-            gain: MidyGMLite.channelSettings.volume,
-        });
-        const pannerNode = new StereoPannerNode(audioContext, {
-            pan: MidyGMLite.channelSettings.pan,
-        });
-        pannerNode.connect(gainNode);
-        gainNode.connect(this.masterGain);
+        const { gainLeft, gainRight } = this.panToGain(MidyGMLite.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);
         return {
-            gainNode,
-            pannerNode,
+            gainL,
+            gainR,
         };
     }
     createChannels(audioContext) {
@@ -278,7 +277,7 @@ export class MidyGMLite {
                     this.handleProgramChange(event.channel, event.programNumber);
                     break;
                 case "pitchBend":
-                    this.handlePitchBend(event.channel, event.value);
+                    this.setPitchBend(event.channel, event.value);
                     break;
                 case "sysEx":
                     this.handleSysEx(event.data);
@@ -358,7 +357,6 @@ export class MidyGMLite {
         const tmpChannels = new Array(16);
         for (let i = 0; i < tmpChannels.length; i++) {
             tmpChannels[i] = {
-                durationTicks: new Map(),
                 programNumber: -1,
                 bank: this.channels[i].bank,
             };
@@ -375,16 +373,6 @@ export class MidyGMLite {
                             instruments.add(`${channel.bank}:0`);
                             channel.programNumber = 0;
                         }
-                        channel.durationTicks.set(event.noteNumber, {
-                            ticks: event.ticks,
-                            noteOn: event,
-                        });
-                        break;
-                    }
-                    case "noteOff": {
-                        const { ticks, noteOn } = tmpChannels[event.channel].durationTicks
-                            .get(event.noteNumber);
-                        noteOn.durationTicks = event.ticks - ticks;
                         break;
                     }
                     case "programChange": {
@@ -398,8 +386,8 @@ export class MidyGMLite {
             });
         });
         const priority = {
-            setTempo: 0,
-            controller: 1,
+            controller: 0,
+            sysEx: 1,
         };
         timeline.sort((a, b) => {
             if (a.ticks !== b.ticks)
@@ -521,9 +509,7 @@ export class MidyGMLite {
     }
     setVolumeEnvelope(channel, note) {
         const { instrumentKey, startTime, velocity } = note;
-        note.gainNode = new GainNode(this.audioContext, {
-            gain: 0,
-        });
+        note.gainNode = new GainNode(this.audioContext, { gain: 0 });
         let volume = (velocity / 127) * channel.volume * channel.expression;
         if (volume === 0)
             volume = 1e-6; // exponentialRampToValueAtTime() requires a non-zero value
@@ -713,20 +699,22 @@ export class MidyGMLite {
     }
     handlePitchBendMessage(channelNumber, lsb, msb) {
         const pitchBend = msb * 128 + lsb;
-        this.handlePitchBend(channelNumber, pitchBend);
+        this.setPitchBend(channelNumber, pitchBend);
     }
-    handlePitchBend(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 semitoneOffset = this.calcSemitoneOffset(channel);
+        const detuneChange = (channel.pitchBend - prevPitchBend) *
+            channel.pitchBendRange * 100;
         const activeNotes = this.getActiveNotes(channel, now);
         activeNotes.forEach((activeNote) => {
-            const { bufferSource, instrumentKey, noteNumber } = activeNote;
-            const playbackRate = calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset);
-            bufferSource.playbackRate
+            const { bufferSource } = activeNote;
+            const detune = bufferSource.detune.value + detuneChange;
+            bufferSource.detune
                 .cancelScheduledValues(now)
-                .setValueAtTime(playbackRate * pressure, now);
+                .setValueAtTime(detune, now);
         });
     }
     handleControlChange(channelNumber, controller, value) {
@@ -780,12 +768,17 @@ export class MidyGMLite {
         channel.volume = volume / 127;
         this.updateChannelGain(channel);
     }
+    panToGain(pan) {
+        const theta = Math.PI / 2 * Math.max(0, pan - 1) / 126;
+        return {
+            gainLeft: Math.cos(theta),
+            gainRight: Math.sin(theta),
+        };
+    }
     setPan(channelNumber, pan) {
-        const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.pan = pan / 127 * 2 - 1; // -1 (left) - +1 (right)
-        channel.pannerNode.pan.cancelScheduledValues(now);
-        channel.pannerNode.pan.setValueAtTime(channel.pan, now);
+        channel.pan = pan;
+        this.updateChannelGain(channel);
     }
     setExpression(channelNumber, expression) {
         const channel = this.channels[channelNumber];
@@ -795,8 +788,13 @@ export class MidyGMLite {
     updateChannelGain(channel) {
         const now = this.audioContext.currentTime;
         const volume = channel.volume * channel.expression;
-        channel.gainNode.gain.cancelScheduledValues(now);
-        channel.gainNode.gain.setValueAtTime(volume, now);
+        const { gainLeft, gainRight } = this.panToGain(channel.pan);
+        channel.gainL.gain
+            .cancelScheduledValues(now)
+            .setValueAtTime(volume * gainLeft, now);
+        channel.gainR.gain
+            .cancelScheduledValues(now)
+            .setValueAtTime(volume * gainRight, now);
     }
     setSustainPedal(channelNumber, value) {
         const isOn = value >= 64;
@@ -818,12 +816,31 @@ export class MidyGMLite {
         const { dataMSB, dataLSB } = channel;
         switch (rpn) {
             case 0:
-                channel.pitchBendRange = dataMSB + dataLSB / 100;
-                break;
+                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);
+    }
+    setPitchBendRange(channelNumber, pitchBendRange) {
+        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;
+            const detune = bufferSource.detune.value + detuneChange;
+            bufferSource.detune
+                .cancelScheduledValues(now)
+                .setValueAtTime(detune, now);
+        });
+    }
     allSoundOff(channelNumber) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
@@ -899,9 +916,9 @@ export class MidyGMLite {
     }
     handleMasterVolumeSysEx(data) {
         const volume = (data[5] * 128 + data[4]) / 16383;
-        this.handleMasterVolume(volume);
+        this.setMasterVolume(volume);
     }
-    handleMasterVolume(volume) {
+    setMasterVolume(volume) {
         if (volume < 0 && 1 < volume) {
             console.error("Master Volume is out of range");
         }
@@ -942,7 +959,7 @@ Object.defineProperty(MidyGMLite, "channelSettings", {
     writable: true,
     value: {
         volume: 100 / 127,
-        pan: 0,
+        pan: 64,
         bank: 0,
         dataMSB: 0,
         dataLSB: 0,

package/esm/midy.d.ts

@@ -84,8 +84,8 @@ export class Midy {
             lfoFilterDepth: number;
             lfoAmplitudeDepth: number;
         };
-        gainNode: any;
-        pannerNode: any;
+        gainL: any;
+        gainR: any;
         reverbEffect: {
             convolverNode: any;
             dryGain: any;
@@ -131,8 +131,8 @@ export class Midy {
     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;
@@ -164,8 +164,8 @@ export class Midy {
             lfoFilterDepth: number;
             lfoAmplitudeDepth: number;
         };
-        gainNode: any;
-        pannerNode: any;
+        gainL: any;
+        gainR: any;
         reverbEffect: {
             convolverNode: any;
             dryGain: any;
@@ -261,12 +261,16 @@ export class Midy {
     handleProgramChange(channelNumber: any, program: any): void;
     handleChannelPressure(channelNumber: any, pressure: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
-    handlePitchBend(channelNumber: any, pitchBend: any): void;
+    setPitchBend(channelNumber: any, pitchBend: any): void;
     handleControlChange(channelNumber: any, controller: any, value: any): any;
     setBankMSB(channelNumber: any, msb: any): void;
     setModulation(channelNumber: any, modulation: any): void;
     setPortamentoTime(channelNumber: any, portamentoTime: any): void;
     setVolume(channelNumber: any, volume: any): void;
+    panToGain(pan: any): {
+        gainLeft: number;
+        gainRight: number;
+    };
     setPan(channelNumber: any, pan: any): void;
     setExpression(channelNumber: any, expression: any): void;
     setBankLSB(channelNumber: any, lsb: any): void;
@@ -285,6 +289,8 @@ export class Midy {
     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;
+    setPitchBendRange(channelNumber: any, pitchBendRange: any): void;
     allSoundOff(channelNumber: any): any[];
     resetAllControllers(channelNumber: any): void;
     allNotesOff(channelNumber: any): any[];
@@ -297,11 +303,11 @@ export class Midy {
     GM2SystemOn(): void;
     handleUniversalRealTimeExclusiveMessage(data: any): void;
     handleMasterVolumeSysEx(data: any): void;
-    handleMasterVolume(volume: any): void;
+    setMasterVolume(volume: any): void;
     handleMasterFineTuningSysEx(data: any): void;
-    handleMasterFineTuning(fineTuning: any): void;
+    setMasterFineTuning(fineTuning: any): void;
     handleMasterCoarseTuningSysEx(data: any): void;
-    handleMasterCoarseTuning(coarseTuning: any): void;
+    setMasterCoarseTuning(coarseTuning: any): void;
     handleExclusiveMessage(data: any): void;
     handleSysEx(data: any): void;
     scheduleTask(callback: any, startTime: any): Promise<any>;

package/esm/midy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"AAuBA;IAwBE;;;;;;;;;;;;;;;;;;;;MAoBE;IAEF;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAzED,qBAAmB;IACnB,kBAAc;IACd,qBAAmB;IACnB,yBAAqB;IACrB,2BAAuB;IACvB,cAAa;IACb,cAAa;IACb,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IA+ChB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;;;;;;;;MAoBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAiBC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EAyDC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA2GC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED;;;;MAoCC;IAED;;;;;MA2CC;IAED,sDA2BC;IAED,2BAEC;IAED,4BAEC;IAED,sCAKC;IAED,mFAGC;IAED,iDAmBC;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,0DAiBC;IAED,0EAkEC;IAED,+CAEC;IAED,yDAiBC;IAED,iEAEC;IAED,iDAIC;IAED,2CAMC;IAED,yDAIC;IAED,+CAEC;IAED,sCAKC;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,+DAuBC;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,sCAQC;IAED,6CAGC;IAED,8CAMC;IAED,+CAGC;IAED,kDAMC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAx/CD;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,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"}

package/esm/midy.js

@@ -225,22 +225,23 @@ export class Midy {
         this.totalTime = this.calcTotalTime();
     }
     setChannelAudioNodes(audioContext) {
-        const gainNode = new GainNode(audioContext, {
-            gain: Midy.channelSettings.volume,
-        });
-        const pannerNode = new StereoPannerNode(audioContext, {
-            pan: Midy.channelSettings.pan,
-        });
+        const { gainLeft, gainRight } = this.panToGain(Midy.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,
         };
@@ -340,7 +341,7 @@ export class Midy {
                     this.handleChannelPressure(event.channel, event.amount);
                     break;
                 case "pitchBend":
-                    this.handlePitchBend(event.channel, event.value);
+                    this.setPitchBend(event.channel, event.value);
                     break;
                 case "sysEx":
                     this.handleSysEx(event.data);
@@ -420,7 +421,6 @@ export class Midy {
         const tmpChannels = new Array(16);
         for (let i = 0; i < tmpChannels.length; i++) {
             tmpChannels[i] = {
-                durationTicks: new Map(),
                 programNumber: -1,
                 bankMSB: this.channels[i].bankMSB,
                 bankLSB: this.channels[i].bankLSB,
@@ -450,16 +450,6 @@ export class Midy {
                             }
                             channel.programNumber = 0;
                         }
-                        channel.durationTicks.set(event.noteNumber, {
-                            ticks: event.ticks,
-                            noteOn: event,
-                        });
-                        break;
-                    }
-                    case "noteOff": {
-                        const { ticks, noteOn } = tmpChannels[event.channel].durationTicks
-                            .get(event.noteNumber);
-                        noteOn.durationTicks = event.ticks - ticks;
                         break;
                     }
                     case "controller":
@@ -494,8 +484,8 @@ export class Midy {
             });
         });
         const priority = {
-            setTempo: 0,
-            controller: 1,
+            controller: 0,
+            sysEx: 1,
         };
         timeline.sort((a, b) => {
             if (a.ticks !== b.ticks)
@@ -633,12 +623,8 @@ export class Midy {
     }
     createChorusEffect(audioContext, options = {}) {
         const { chorusCount = 2, chorusRate = 0.6, chorusDepth = 0.15, delay = 0.01, variance = delay * 0.1, } = options;
-        const lfo = new OscillatorNode(audioContext, {
-            frequency: chorusRate,
-        });
-        const lfoGain = new GainNode(audioContext, {
-            gain: chorusDepth,
-        });
+        const lfo = new OscillatorNode(audioContext, { frequency: chorusRate });
+        const lfoGain = new GainNode(audioContext, { gain: chorusDepth });
         const chorusGains = [];
         const delayNodes = [];
         const baseGain = 1 / chorusCount;
@@ -649,9 +635,7 @@ export class Midy {
                 maxDelayTime: delayTime,
             });
             delayNodes.push(delayNode);
-            const chorusGain = new GainNode(audioContext, {
-                gain: baseGain,
-            });
+            const chorusGain = new GainNode(audioContext, { gain: baseGain });
             chorusGains.push(chorusGain);
             lfo.connect(lfoGain);
             lfoGain.connect(delayNode.delayTime);
@@ -713,9 +697,7 @@ export class Midy {
     }
     setVolumeEnvelope(channel, note) {
         const { instrumentKey, startTime, velocity } = note;
-        note.gainNode = new GainNode(this.audioContext, {
-            gain: 0,
-        });
+        note.gainNode = new GainNode(this.audioContext, { gain: 0 });
         let volume = (velocity / 127) * channel.volume * channel.expression;
         if (volume === 0)
             volume = 1e-6; // exponentialRampToValueAtTime() requires a non-zero value
@@ -992,20 +974,22 @@ export class Midy {
     }
     handlePitchBendMessage(channelNumber, lsb, msb) {
         const pitchBend = msb * 128 + lsb;
-        this.handlePitchBend(channelNumber, pitchBend);
+        this.setPitchBend(channelNumber, pitchBend);
     }
-    handlePitchBend(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 semitoneOffset = this.calcSemitoneOffset(channel);
+        const detuneChange = (channel.pitchBend - prevPitchBend) *
+            channel.pitchBendRange * 100;
         const activeNotes = this.getActiveNotes(channel, now);
         activeNotes.forEach((activeNote) => {
-            const { bufferSource, instrumentKey, noteNumber } = activeNote;
-            const playbackRate = calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset);
-            bufferSource.playbackRate
+            const { bufferSource } = activeNote;
+            const detune = bufferSource.detune.value + detuneChange;
+            bufferSource.detune
                 .cancelScheduledValues(now)
-                .setValueAtTime(playbackRate * pressure, now);
+                .setValueAtTime(detune, now);
         });
     }
     handleControlChange(channelNumber, controller, value) {
@@ -1100,12 +1084,17 @@ export class Midy {
         channel.volume = volume / 127;
         this.updateChannelGain(channel);
     }
+    panToGain(pan) {
+        const theta = Math.PI / 2 * Math.max(0, pan - 1) / 126;
+        return {
+            gainLeft: Math.cos(theta),
+            gainRight: Math.sin(theta),
+        };
+    }
     setPan(channelNumber, pan) {
-        const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.pan = pan / 127 * 2 - 1; // -1 (left) - +1 (right)
-        channel.pannerNode.pan.cancelScheduledValues(now);
-        channel.pannerNode.pan.setValueAtTime(channel.pan, now);
+        channel.pan = pan;
+        this.updateChannelGain(channel);
     }
     setExpression(channelNumber, expression) {
         const channel = this.channels[channelNumber];
@@ -1118,8 +1107,13 @@ export class Midy {
     updateChannelGain(channel) {
         const now = this.audioContext.currentTime;
         const volume = channel.volume * channel.expression;
-        channel.gainNode.gain.cancelScheduledValues(now);
-        channel.gainNode.gain.setValueAtTime(volume, now);
+        const { gainLeft, gainRight } = this.panToGain(channel.pan);
+        channel.gainL.gain
+            .cancelScheduledValues(now)
+            .setValueAtTime(volume * gainLeft, now);
+        channel.gainR.gain
+            .cancelScheduledValues(now)
+            .setValueAtTime(volume * gainRight, now);
     }
     setSustainPedal(channelNumber, value) {
         const isOn = value >= 64;
@@ -1229,8 +1223,7 @@ export class Midy {
         const { dataMSB, dataLSB } = channel;
         switch (rpn) {
             case 0:
-                channel.pitchBendRange = dataMSB + dataLSB / 100;
-                break;
+                return this.handlePitchBendRangeMessage(channelNumber, dataMSB, dataLSB);
             case 1:
                 channel.fineTuning = (dataMSB * 128 + dataLSB - 8192) / 8192;
                 break;
@@ -1244,6 +1237,26 @@ export class Midy {
                 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);
+    }
+    setPitchBendRange(channelNumber, pitchBendRange) {
+        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;
+            const detune = bufferSource.detune.value + detuneChange;
+            bufferSource.detune
+                .cancelScheduledValues(now)
+                .setValueAtTime(detune, now);
+        });
+    }
     allSoundOff(channelNumber) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
@@ -1334,9 +1347,9 @@ export class Midy {
                     case 1:
                         return this.handleMasterVolumeSysEx(data);
                     case 3:
-                        return this.handleMasterFineTuning(data);
+                        return this.handleMasterFineTuningSysEx(data);
                     case 4:
-                        return this.handleMasterCoarseTuning(data);
+                        return this.handleMasterCoarseTuningSysEx(data);
                     // case 5: // TODO: Global Parameter Control
                     default:
                         console.warn(`Unsupported Exclusive Message ${data}`);
@@ -1378,9 +1391,9 @@ export class Midy {
     }
     handleMasterVolumeSysEx(data) {
         const volume = (data[5] * 128 + data[4]) / 16383;
-        this.handleMasterVolume(volume);
+        this.setMasterVolume(volume);
     }
-    handleMasterVolume(volume) {
+    setMasterVolume(volume) {
         if (volume < 0 && 1 < volume) {
             console.error("Master Volume is out of range");
         }
@@ -1392,9 +1405,9 @@ export class Midy {
     }
     handleMasterFineTuningSysEx(data) {
         const fineTuning = (data[5] * 128 + data[4] - 8192) / 8192;
-        this.handleMasterFineTuning(fineTuning);
+        this.setMasterFineTuning(fineTuning);
     }
-    handleMasterFineTuning(fineTuning) {
+    setMasterFineTuning(fineTuning) {
         if (fineTuning < -1 && 1 < fineTuning) {
             console.error("Master Fine Tuning value is out of range");
         }
@@ -1404,9 +1417,9 @@ export class Midy {
     }
     handleMasterCoarseTuningSysEx(data) {
         const coarseTuning = data[4];
-        this.handleMasterCoarseTuning(coarseTuning);
+        this.setMasterCoarseTuning(coarseTuning);
     }
-    handleMasterCoarseTuning(coarseTuning) {
+    setMasterCoarseTuning(coarseTuning) {
         if (coarseTuning < 0 && 127 < coarseTuning) {
             console.error("Master Coarse Tuning value is out of range");
         }
@@ -1446,7 +1459,7 @@ Object.defineProperty(Midy, "channelSettings", {
     value: {
         currentBufferSource: null,
         volume: 100 / 127,
-        pan: 0,
+        pan: 64,
         portamentoTime: 0,
         reverb: 0,
         chorus: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "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

@@ -41,8 +41,8 @@ export class MidyGM1 {
     masterGain: any;
     channels: {
         scheduledNotes: Map<any, any>;
-        gainNode: any;
-        pannerNode: any;
+        gainL: any;
+        gainR: any;
         expression: number;
         modulation: number;
         sustainPedal: boolean;
@@ -65,13 +65,13 @@ export class MidyGM1 {
     loadSoundFont(soundFontUrl: any): Promise<void>;
     loadMIDI(midiUrl: any): Promise<void>;
     setChannelAudioNodes(audioContext: any): {
-        gainNode: any;
-        pannerNode: any;
+        gainL: any;
+        gainR: any;
     };
     createChannels(audioContext: any): {
         scheduledNotes: Map<any, any>;
-        gainNode: any;
-        pannerNode: any;
+        gainL: any;
+        gainR: any;
         expression: number;
         modulation: number;
         sustainPedal: boolean;
@@ -128,10 +128,14 @@ export class MidyGM1 {
     handleMIDIMessage(statusByte: any, data1: any, data2: any): void | any[] | Promise<any>;
     handleProgramChange(channelNumber: any, program: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
-    handlePitchBend(channelNumber: any, pitchBend: any): void;
+    setPitchBend(channelNumber: any, pitchBend: any): void;
     handleControlChange(channelNumber: any, controller: any, value: any): void | any[];
     setModulation(channelNumber: any, modulation: any): void;
     setVolume(channelNumber: any, volume: any): void;
+    panToGain(pan: any): {
+        gainLeft: number;
+        gainRight: number;
+    };
     setPan(channelNumber: any, pan: any): void;
     setExpression(channelNumber: any, expression: any): void;
     updateChannelGain(channel: any): void;
@@ -139,6 +143,8 @@ export class MidyGM1 {
     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;
+    setPitchBendRange(channelNumber: any, pitchBendRange: any): void;
     allSoundOff(channelNumber: any): any[];
     resetAllControllers(channelNumber: any): void;
     allNotesOff(channelNumber: any): any[];
@@ -146,7 +152,7 @@ export class MidyGM1 {
     GM1SystemOn(): void;
     handleUniversalRealTimeExclusiveMessage(data: any): void;
     handleMasterVolumeSysEx(data: any): void;
-    handleMasterVolume(volume: any): void;
+    setMasterVolume(volume: any): void;
     handleExclusiveMessage(data: any): void;
     handleSysEx(data: any): void;
     scheduleTask(callback: any, startTime: any): Promise<any>;
@@ -158,8 +164,6 @@ declare class Note {
     filterNode: any;
     modLFO: any;
     modLFOGain: any;
-    vibLFO: any;
-    vibLFOGain: any;
     noteNumber: any;
     velocity: any;
     startTime: 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":"AAuBA;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;;;MAaC;IAED;;;;;;;;;;;;;;;;;;;;QAUC;IAED,+DAyBC;IAED,mEAWC;IAED,qDAOC;IAED,2EA+CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAyEC;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,iDAmBC;IAED,iDAiCC;IAED,0DAmBC;IAED,wHA6BC;IAED,kGA6BC;IAED,0EAGC;IAED,sIAmDC;IAED,0FAGC;IAED,kEAeC;IAED,wFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,0DAiBC;IAED,mFA+BC;IAED,yDAiBC;IAED,iDAIC;IAED,2CAMC;IAED,yDAIC;IAED,sCAKC;IAED,sDAMC;IAED,gDAEC;IAED,gDAEC;IAED,+DAoBC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,sCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAv+BD;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-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"}