@marmooo/midy 0.0.7 → 0.0.8

package/script/midy.js

@@ -78,13 +78,13 @@ 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,
@@ -751,7 +751,7 @@ 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),
@@ -998,7 +998,7 @@ 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:
@@ -1008,7 +1008,7 @@ 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:
@@ -1025,13 +1025,13 @@ 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);
+                return this.setChorusSendLevel(channelNumber, value);
             case 96: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp18.pdf
-                return incrementRPNValue(channelNumber);
+                return this.dataIncrement(channelNumber);
             case 97: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp18.pdf
-                return decrementRPNValue(channelNumber);
+                return this.dataDecrement(channelNumber);
             case 100:
                 return this.setRPNLSB(channelNumber, value);
             case 101:
@@ -1057,22 +1057,24 @@ 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;
     }
@@ -1101,6 +1103,10 @@ 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;
@@ -1122,7 +1128,7 @@ 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;
@@ -1132,7 +1138,7 @@ 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;
@@ -1198,31 +1204,34 @@ class Midy {
             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.dataLSB += value;
-                this.handlePitchBendRangeMessage(channelNumber);
+                this.handlePitchBendRangeRPN(channelNumber);
                 break;
             case 1:
                 channel.dataLSB += value;
-                this.handleFineTuningMessage(channelNumber);
+                this.handleFineTuningRPN(channelNumber);
                 break;
             case 2:
                 channel.dataMSB += value;
-                this.handleCoarseTuningMessage(channelNumber);
+                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}`);
         }
     }
-    incrementRPNValue(channelNumber) {
+    dataIncrement(channelNumber) {
         this.handleRPN(channelNumber, 1);
     }
-    decrementRPNValue(channelNumber) {
+    dataDecrement(channelNumber) {
         this.handleRPN(channelNumber, -1);
     }
     setRPNMSB(channelNumber, value) {
@@ -1231,9 +1240,8 @@ class Midy {
     setRPNLSB(channelNumber, value) {
         this.channels[channelNumber].rpnLSB = value;
     }
-    setDataEntry(channelNumber, value, isMSB) {
-        const channel = this.channels[channelNumber];
-        isMSB ? channel.dataMSB = value : channel.dataLSB = value;
+    dataEntryMSB(channelNumber, value) {
+        this.channels[channelNumber].dataMSB = value;
         this.handleRPN(channelNumber, 0);
     }
     updateDetune(channel, detuneChange) {
@@ -1247,7 +1255,7 @@ class Midy {
                 .setValueAtTime(detune, now);
         });
     }
-    handlePitchBendRangeMessage(channelNumber) {
+    handlePitchBendRangeRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 99);
         const pitchBendRange = channel.dataMSB + channel.dataLSB / 100;
@@ -1261,7 +1269,7 @@ class Midy {
             channel.pitchBend * 100;
         this.updateDetune(channel, detuneChange);
     }
-    handleFineTuningMessage(channelNumber) {
+    handleFineTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 127);
         const fineTuning = (channel.dataMSB * 128 + channel.dataLSB - 8192) / 8192;
@@ -1269,9 +1277,12 @@ class Midy {
     }
     setFineTuning(channelNumber, fineTuning) {
         const channel = this.channels[channelNumber];
+        const prevFineTuning = channel.fineTuning;
         channel.fineTuning = fineTuning;
+        const detuneChange = channel.fineTuning - prevFineTuning;
+        this.updateDetune(channel, detuneChange);
     }
-    handleCoarseTuningMessage(channelNumber) {
+    handleCoarseTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
         this.limitDataMSB(channel, 0, 127);
         const coarseTuning = channel.dataMSB - 64;
@@ -1279,7 +1290,22 @@ class Midy {
     }
     setCoarseTuning(channelNumber, coarseTuning) {
         const channel = this.channels[channelNumber];
-        channel.fineTuning = coarseTuning;
+        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;
@@ -1370,9 +1396,9 @@ 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:
@@ -1498,9 +1524,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", {