@marmooo/midy 0.0.5 → 0.0.7

package/script/midy.js

@@ -228,22 +228,23 @@ 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,
         };
@@ -343,7 +344,7 @@ 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);
@@ -423,7 +424,6 @@ 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,
@@ -453,16 +453,6 @@ 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":
@@ -497,8 +487,8 @@ class Midy {
             });
         });
         const priority = {
-            setTempo: 0,
-            controller: 1,
+            controller: 0,
+            sysEx: 1,
         };
         timeline.sort((a, b) => {
             if (a.ticks !== b.ticks)
@@ -636,12 +626,8 @@ 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;
@@ -652,9 +638,7 @@ 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);
@@ -670,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);
                 });
             }
         }
@@ -716,9 +702,7 @@ 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
@@ -995,21 +979,15 @@ class Midy {
     }
     handlePitchBendMessage(channelNumber, lsb, msb) {
         const pitchBend = msb * 128 + lsb;
-        this.handlePitchBend(channelNumber, pitchBend);
+        this.setPitchBend(channelNumber, pitchBend);
     }
-    handlePitchBend(channelNumber, pitchBend) {
-        const now = this.audioContext.currentTime;
+    setPitchBend(channelNumber, pitchBend) {
         const channel = this.channels[channelNumber];
+        const prevPitchBend = channel.pitchBend;
         channel.pitchBend = (pitchBend - 8192) / 8192;
-        const semitoneOffset = this.calcSemitoneOffset(channel);
-        const activeNotes = this.getActiveNotes(channel, now);
-        activeNotes.forEach((activeNote) => {
-            const { bufferSource, instrumentKey, noteNumber } = activeNote;
-            const playbackRate = calcPlaybackRate(instrumentKey, noteNumber, semitoneOffset);
-            bufferSource.playbackRate
-                .cancelScheduledValues(now)
-                .setValueAtTime(playbackRate * pressure, now);
-        });
+        const detuneChange = (channel.pitchBend - prevPitchBend) *
+            channel.pitchBendRange * 100;
+        this.updateDetune(channel, detuneChange);
     }
     handleControlChange(channelNumber, controller, value) {
         switch (controller) {
@@ -1050,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:
@@ -1103,12 +1081,17 @@ 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];
@@ -1121,8 +1104,13 @@ 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;
@@ -1184,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;
@@ -1224,28 +1231,55 @@ 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:
-                channel.pitchBendRange = dataMSB + dataLSB / 100;
-                break;
-            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);
+    }
+    updateDetune(channel, detuneChange) {
+        const now = this.audioContext.currentTime;
+        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);
+        });
+    }
+    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;
@@ -1318,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) => {
@@ -1337,9 +1371,9 @@ 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}`);
@@ -1381,9 +1415,9 @@ 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");
         }
@@ -1395,9 +1429,9 @@ 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");
         }
@@ -1407,9 +1441,9 @@ 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");
         }
@@ -1450,7 +1484,7 @@ Object.defineProperty(Midy, "channelSettings", {
     value: {
         currentBufferSource: null,
         volume: 100 / 127,
-        pan: 0,
+        pan: 64,
         portamentoTime: 0,
         reverb: 0,
         chorus: 0,