@marmooo/midy 0.2.3 → 0.2.4

package/script/midy.js

@@ -89,6 +89,12 @@ class Note {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "pressure", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
         this.noteNumber = noteNumber;
         this.velocity = velocity;
         this.startTime = startTime;
@@ -100,7 +106,7 @@ class Note {
 const defaultControllerState = {
     noteOnVelocity: { type: 2, defaultValue: 0 },
     noteOnKeyNumber: { type: 3, defaultValue: 0 },
-    polyPressure: { type: 10, defaultValue: 0 },
+    polyphonicKeyPressure: { type: 10, defaultValue: 0 },
     channelPressure: { type: 13, defaultValue: 0 },
     pitchWheel: { type: 14, defaultValue: 8192 / 16383 },
     pitchWheelSensitivity: { type: 16, defaultValue: 2 / 128 },
@@ -432,12 +438,6 @@ class Midy {
                 ...this.setChannelAudioNodes(audioContext),
                 scheduledNotes: new Map(),
                 sostenutoNotes: new Map(),
-                polyphonicKeyPressure: {
-                    ...this.constructor.controllerDestinationSettings,
-                },
-                channelPressure: {
-                    ...this.constructor.controllerDestinationSettings,
-                },
             };
         });
         return channels;
@@ -942,28 +942,31 @@ class Midy {
         const pitchWheel = channel.state.pitchWheel * 2 - 1;
         const pitchWheelSensitivity = channel.state.pitchWheelSensitivity * 12800;
         const pitch = pitchWheel * pitchWheelSensitivity;
-        const pressureDepth = (channel.pressureTable[0] - 64) / 37.5; // 2400 / 64;
+        const pressureDepth = (channel.channelPressureTable[0] - 64) / 37.5; // 2400 / 64;
         const pressure = pressureDepth * channel.state.channelPressure;
         return tuning + pitch + pressure;
     }
     calcNoteDetune(channel, note) {
         return channel.scaleOctaveTuningTable[note.noteNumber % 12];
     }
-    updateDetune(channel) {
-        const now = this.audioContext.currentTime;
+    updateChannelDetune(channel) {
         channel.scheduledNotes.forEach((noteList) => {
             for (let i = 0; i < noteList.length; i++) {
                 const note = noteList[i];
                 if (!note)
                     continue;
-                const noteDetune = this.calcNoteDetune(channel, note);
-                const detune = channel.detune + noteDetune;
-                note.bufferSource.detune
-                    .cancelScheduledValues(now)
-                    .setValueAtTime(detune, now);
+                this.updateDetune(channel, note, 0);
             }
         });
     }
+    updateDetune(channel, note, pressure) {
+        const now = this.audioContext.currentTime;
+        const noteDetune = this.calcNoteDetune(channel, note);
+        const detune = channel.detune + noteDetune + pressure;
+        note.bufferSource.detune
+            .cancelScheduledValues(now)
+            .setValueAtTime(detune, now);
+    }
     getPortamentoTime(channel) {
         const factor = 5 * Math.log(10) / 127;
         const time = channel.state.portamentoTime;
@@ -981,14 +984,12 @@ class Midy {
             .setValueAtTime(0, volDelay)
             .linearRampToValueAtTime(sustainVolume, portamentoTime);
     }
-    setVolumeEnvelope(channel, note) {
+    setVolumeEnvelope(channel, note, pressure) {
         const now = this.audioContext.currentTime;
         const state = channel.state;
         const { voiceParams, startTime } = note;
-        const pressureDepth = channel.pressureTable[2] / 64;
-        const pressure = 1 + pressureDepth * channel.state.channelPressure;
         const attackVolume = this.cbToRatio(-voiceParams.initialAttenuation) *
-            pressure;
+            (1 + pressure);
         const sustainVolume = attackVolume * (1 - voiceParams.volSustain);
         const volDelay = startTime + voiceParams.volDelay;
         const volAttack = volDelay + voiceParams.volAttack * state.attackTime * 2;
@@ -1036,10 +1037,8 @@ class Midy {
         const { voiceParams, noteNumber, startTime } = note;
         const softPedalFactor = 1 -
             (0.1 + (noteNumber / 127) * 0.2) * state.softPedal;
-        const pressureDepth = (channel.pressureTable[1] - 64) * 15;
-        const pressure = pressureDepth * channel.state.channelPressure;
-        const baseCent = voiceParams.initialFilterFc + pressure;
-        const baseFreq = this.centToHz(baseCent) * softPedalFactor *
+        const baseFreq = this.centToHz(voiceParams.initialFilterFc) *
+            softPedalFactor *
             state.brightness * 2;
         const peekFreq = this.centToHz(voiceParams.initialFilterFc + voiceParams.modEnvToFilterFc) * softPedalFactor * state.brightness * 2;
         const sustainFreq = baseFreq +
@@ -1054,15 +1053,17 @@ class Midy {
             .setValueAtTime(adjustedBaseFreq, modDelay)
             .linearRampToValueAtTime(adjustedSustainFreq, portamentoTime);
     }
-    setFilterEnvelope(channel, note) {
+    setFilterEnvelope(channel, note, pressure) {
         const now = this.audioContext.currentTime;
         const state = channel.state;
         const { voiceParams, noteNumber, startTime } = note;
         const softPedalFactor = 1 -
             (0.1 + (noteNumber / 127) * 0.2) * state.softPedal;
-        const baseFreq = this.centToHz(voiceParams.initialFilterFc) *
+        const baseCent = voiceParams.initialFilterFc + pressure;
+        const baseFreq = this.centToHz(baseCent) * softPedalFactor *
+            state.brightness * 2;
+        const peekFreq = this.centToHz(baseCent + voiceParams.modEnvToFilterFc) *
             softPedalFactor * state.brightness * 2;
-        const peekFreq = this.centToHz(voiceParams.initialFilterFc + voiceParams.modEnvToFilterFc) * softPedalFactor * state.brightness * 2;
         const sustainFreq = baseFreq +
             (peekFreq - baseFreq) * (1 - voiceParams.modSustain);
         const adjustedBaseFreq = this.clampCutoffFrequency(baseFreq);
@@ -1089,9 +1090,9 @@ class Midy {
             gain: voiceParams.modLfoToFilterFc,
         });
         note.modulationDepth = new GainNode(this.audioContext);
-        this.setModLfoToPitch(channel, note);
+        this.setModLfoToPitch(channel, note, 0);
         note.volumeDepth = new GainNode(this.audioContext);
-        this.setModLfoToVolume(channel, note);
+        this.setModLfoToVolume(note, 0);
         note.modulationLFO.start(startTime + voiceParams.delayModLFO);
         note.modulationLFO.connect(note.filterDepth);
         note.filterDepth.connect(note.filterNode.frequency);
@@ -1104,8 +1105,7 @@ class Midy {
         const { voiceParams } = note;
         const state = channel.state;
         note.vibratoLFO = new OscillatorNode(this.audioContext, {
-            frequency: this.centToHz(voiceParams.freqVibLFO) *
-                state.vibratoRate,
+            frequency: this.centToHz(voiceParams.freqVibLFO) * state.vibratoRate * 2,
         });
         note.vibratoLFO.start(startTime + voiceParams.delayVibLFO * state.vibratoDelay * 2);
         note.vibratoDepth = new GainNode(this.audioContext);
@@ -1134,8 +1134,8 @@ class Midy {
         }
         else {
             note.portamento = false;
-            this.setVolumeEnvelope(channel, note);
-            this.setFilterEnvelope(channel, note);
+            this.setVolumeEnvelope(channel, note, 0);
+            this.setFilterEnvelope(channel, note, 0);
         }
         if (0 < state.vibratoDepth) {
             this.startVibrato(channel, note, startTime);
@@ -1350,16 +1350,12 @@ class Midy {
     handlePolyphonicKeyPressure(channelNumber, noteNumber, pressure) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        pressure /= 64;
+        channel.state.polyphonicKeyPressure = pressure / 127;
+        const table = channel.polyphonicKeyPressureTable;
         const activeNotes = this.getActiveNotes(channel, now);
-        if (channel.polyphonicKeyPressure.amplitudeControl !== 1) {
-            if (activeNotes.has(noteNumber)) {
-                const activeNote = activeNotes.get(noteNumber);
-                const gain = activeNote.gainL.gain.value;
-                activeNote.volumeNode.gain
-                    .cancelScheduledValues(now)
-                    .setValueAtTime(gain * pressure, now);
-            }
+        if (activeNotes.has(noteNumber)) {
+            const note = activeNotes.get(noteNumber);
+            this.applyDestinationSettings(channel, note, table);
         }
         // this.applyVoiceParams(channel, 10);
     }
@@ -1373,11 +1369,11 @@ class Midy {
         const prev = channel.state.channelPressure;
         const next = value / 127;
         channel.state.channelPressure = next;
-        if (channel.pressureTable[0] !== 64) {
-            const pressureDepth = (channel.pressureTable[0] - 64) / 37.5; // 2400 / 64;
+        if (channel.channelPressureTable[0] !== 64) {
+            const pressureDepth = (channel.channelPressureTable[0] - 64) / 37.5; // 2400 / 64;
             channel.detune += pressureDepth * (next - prev);
         }
-        const table = channel.pressureTable;
+        const table = channel.channelPressureTable;
         channel.scheduledNotes.forEach((noteList) => {
             for (let i = 0; i < noteList.length; i++) {
                 const note = noteList[i];
@@ -1399,16 +1395,13 @@ class Midy {
         const next = (value - 8192) / 8192;
         state.pitchWheel = value / 16383;
         channel.detune += (next - prev) * state.pitchWheelSensitivity * 12800;
-        this.updateDetune(channel);
+        this.updateChannelDetune(channel);
         this.applyVoiceParams(channel, 14);
     }
-    setModLfoToPitch(channel, note) {
+    setModLfoToPitch(channel, note, pressure) {
         const now = this.audioContext.currentTime;
-        const pressureDepth = channel.pressureTable[3] / 127 * 600;
-        const pressure = pressureDepth * channel.state.channelPressure;
         const modLfoToPitch = note.voiceParams.modLfoToPitch + pressure;
-        const baseDepth = Math.abs(modLfoToPitch) +
-            channel.state.modulationDepth;
+        const baseDepth = Math.abs(modLfoToPitch) + channel.state.modulationDepth;
         const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
         note.modulationDepth.gain
             .cancelScheduledValues(now)
@@ -1424,22 +1417,18 @@ class Midy {
             .cancelScheduledValues(now)
             .setValueAtTime(vibratoDepth * vibratoDepthSign, now);
     }
-    setModLfoToFilterFc(channel, note) {
+    setModLfoToFilterFc(note, pressure) {
         const now = this.audioContext.currentTime;
-        const pressureDepth = channel.pressureTable[4] / 127 * 2400;
-        const pressure = pressureDepth * channel.state.channelPressure;
         const modLfoToFilterFc = note.voiceParams.modLfoToFilterFc + pressure;
         note.filterDepth.gain
             .cancelScheduledValues(now)
             .setValueAtTime(modLfoToFilterFc, now);
     }
-    setModLfoToVolume(channel, note) {
+    setModLfoToVolume(note, pressure) {
         const now = this.audioContext.currentTime;
         const modLfoToVolume = note.voiceParams.modLfoToVolume;
         const baseDepth = this.cbToRatio(Math.abs(modLfoToVolume)) - 1;
-        const pressureDepth = channel.pressureTable[5] / 127;
-        const pressure = 1 + pressureDepth * channel.state.channelPressure;
-        const volumeDepth = baseDepth * Math.sign(modLfoToVolume) * pressure;
+        const volumeDepth = baseDepth * Math.sign(modLfoToVolume) * (1 + pressure);
         note.volumeDepth.gain
             .cancelScheduledValues(now)
             .setValueAtTime(volumeDepth, now);
@@ -1512,11 +1501,18 @@ class Midy {
             .cancelScheduledValues(now)
             .setValueAtTime(freqModLFO, now);
     }
+    setFreqVibLFO(channel, note) {
+        const now = this.audioContext.currentTime;
+        const freqVibLFO = note.voiceParams.freqVibLFO;
+        note.vibratoLFO.frequency
+            .cancelScheduledValues(now)
+            .setValueAtTime(freqVibLFO * channel.state.vibratoRate * 2, now);
+    }
     createVoiceParamsHandlers() {
         return {
             modLfoToPitch: (channel, note, _prevValue) => {
                 if (0 < channel.state.modulationDepth) {
-                    this.setModLfoToPitch(channel, note);
+                    this.setModLfoToPitch(channel, note, 0);
                 }
             },
             vibLfoToPitch: (channel, note, _prevValue) => {
@@ -1526,12 +1522,12 @@ class Midy {
             },
             modLfoToFilterFc: (channel, note, _prevValue) => {
                 if (0 < channel.state.modulationDepth) {
-                    this.setModLfoToFilterFc(channel, note);
+                    this.setModLfoToFilterFc(note, 0);
                 }
             },
             modLfoToVolume: (channel, note, _prevValue) => {
                 if (0 < channel.state.modulationDepth) {
-                    this.setModLfoToVolume(channel, note);
+                    this.setModLfoToVolume(note, 0);
                 }
             },
             chorusEffectsSend: (channel, note, prevValue) => {
@@ -1557,11 +1553,7 @@ class Midy {
             },
             freqVibLFO: (channel, note, _prevValue) => {
                 if (0 < channel.state.vibratoDepth) {
-                    const now = this.audioContext.currentTime;
-                    const freqVibLFO = note.voiceParams.freqVibLFO;
-                    note.vibratoLFO.frequency
-                        .cancelScheduledValues(now)
-                        .setValueAtTime(freqVibLFO * channel.state.vibratoRate, now);
+                    this.setFreqVibLFO(channel, note);
                 }
             },
         };
@@ -1605,7 +1597,7 @@ class Midy {
                             this.setPortamentoStartFilterEnvelope(channel, note);
                         }
                         else {
-                            this.setFilterEnvelope(channel, note);
+                            this.setFilterEnvelope(channel, note, 0);
                         }
                         this.setPitchEnvelope(note);
                     }
@@ -1619,7 +1611,7 @@ class Midy {
                             if (key in voiceParams)
                                 noteVoiceParams[key] = voiceParams[key];
                         }
-                        this.setVolumeEnvelope(channel, note);
+                        this.setVolumeEnvelope(channel, note, 0);
                     }
                 }
             }
@@ -1840,7 +1832,7 @@ class Midy {
                     continue;
                 if (note.startTime < now)
                     continue;
-                this.setVolumeEnvelope(channel, note);
+                this.setVolumeEnvelope(channel, note, 0);
             }
         });
     }
@@ -1852,7 +1844,12 @@ class Midy {
                 const note = noteList[i];
                 if (!note)
                     continue;
-                this.setFilterEnvelope(channel, note);
+                if (note.portamento) {
+                    this.setPortamentoStartFilterEnvelope(channel, note);
+                }
+                else {
+                    this.setFilterEnvelope(channel, note, 0);
+                }
             }
         });
     }
@@ -1864,7 +1861,7 @@ class Midy {
                 const note = noteList[i];
                 if (!note)
                     continue;
-                this.setVolumeEnvelope(channel, note);
+                this.setVolumeEnvelope(channel, note, 0);
             }
         });
     }
@@ -1873,21 +1870,53 @@ class Midy {
         channel.state.vibratoRate = vibratoRate / 64;
         if (channel.vibratoDepth <= 0)
             return;
-        const now = this.audioContext.currentTime;
-        const activeNotes = this.getActiveNotes(channel, now);
-        activeNotes.forEach((activeNote) => {
-            activeNote.vibratoLFO.frequency
-                .cancelScheduledValues(now)
-                .setValueAtTime(channel.state.vibratoRate, now);
+        channel.scheduledNotes.forEach((noteList) => {
+            for (let i = 0; i < noteList.length; i++) {
+                const note = noteList[i];
+                if (!note)
+                    continue;
+                this.setVibLfoToPitch(channel, note);
+            }
         });
     }
     setVibratoDepth(channelNumber, vibratoDepth) {
         const channel = this.channels[channelNumber];
+        const prev = channel.state.vibratoDepth;
         channel.state.vibratoDepth = vibratoDepth / 64;
+        if (0 < prev) {
+            channel.scheduledNotes.forEach((noteList) => {
+                for (let i = 0; i < noteList.length; i++) {
+                    const note = noteList[i];
+                    if (!note)
+                        continue;
+                    this.setFreqVibLFO(channel, note);
+                }
+            });
+        }
+        else {
+            channel.scheduledNotes.forEach((noteList) => {
+                for (let i = 0; i < noteList.length; i++) {
+                    const note = noteList[i];
+                    if (!note)
+                        continue;
+                    this.startVibrato(channel, note, note.startTime);
+                }
+            });
+        }
     }
     setVibratoDelay(channelNumber, vibratoDelay) {
         const channel = this.channels[channelNumber];
         channel.state.vibratoDelay = vibratoDelay / 64;
+        if (0 < channel.state.vibratoDepth) {
+            channel.scheduledNotes.forEach((noteList) => {
+                for (let i = 0; i < noteList.length; i++) {
+                    const note = noteList[i];
+                    if (!note)
+                        continue;
+                    this.startVibrato(channel, note, note.startTime);
+                }
+            });
+        }
     }
     setReverbSendLevel(channelNumber, reverbSendLevel) {
         const channel = this.channels[channelNumber];
@@ -2052,7 +2081,7 @@ class Midy {
         const next = value / 128;
         state.pitchWheelSensitivity = next;
         channel.detune += (state.pitchWheel * 2 - 1) * (next - prev) * 12800;
-        this.updateDetune(channel);
+        this.updateChannelDetune(channel);
         this.applyVoiceParams(channel, 16);
     }
     handleFineTuningRPN(channelNumber) {
@@ -2067,7 +2096,7 @@ class Midy {
         const next = (value - 8192) / 8.192; // cent
         channel.fineTuning = next;
         channel.detune += next - prev;
-        this.updateDetune(channel);
+        this.updateChannelDetune(channel);
     }
     handleCoarseTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
@@ -2081,7 +2110,7 @@ class Midy {
         const next = (value - 64) * 100; // cent
         channel.coarseTuning = next;
         channel.detune += next - prev;
-        this.updateDetune(channel);
+        this.updateChannelDetune(channel);
     }
     handleModulationDepthRangeRPN(channelNumber) {
         const channel = this.channels[channelNumber];
@@ -2112,7 +2141,7 @@ class Midy {
         const state = channel.state;
         for (let i = 0; i < stateTypes.length; i++) {
             const type = stateTypes[i];
-            state[type] = defaultControllerState[type];
+            state[type] = defaultControllerState[type].defaultValue;
         }
         const settingTypes = [
             "rpnMSB",
@@ -2215,7 +2244,9 @@ class Midy {
             case 9:
                 switch (data[3]) {
                     case 1: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca22.pdf
-                        return this.handleChannelPressureSysEx(data);
+                        return this.handlePressureSysEx(data, "channelPressureTable");
+                    case 2: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca22.pdf
+                        return this.handlePressureSysEx(data, "polyphonicKeyPressureTable");
                     case 3: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca22.pdf
                         return this.handleControlChangeSysEx(data);
                     default:
@@ -2257,7 +2288,7 @@ class Midy {
         const next = (value - 8192) / 8.192; // cent
         this.masterFineTuning = next;
         channel.detune += next - prev;
-        this.updateDetune(channel);
+        this.updateChannelDetune(channel);
     }
     handleMasterCoarseTuningSysEx(data) {
         const coarseTuning = data[4];
@@ -2268,7 +2299,7 @@ class Midy {
         const next = (value - 64) * 100; // cent
         this.masterCoarseTuning = next;
         channel.detune += next - prev;
-        this.updateDetune(channel);
+        this.updateChannelDetune(channel);
     }
     handleGlobalParameterControlSysEx(data) {
         if (data[7] === 1) {
@@ -2492,29 +2523,63 @@ class Midy {
     }
     applyDestinationSettings(channel, note, table) {
         if (table[0] !== 64) {
-            this.updateDetune(channel);
+            const polyphonicKeyPressure = (0 < note.pressure)
+                ? channel.polyphonicKeyPressureTable[0] * note.pressure
+                : 0;
+            const pressure = (polyphonicKeyPressure - 64) / 37.5; // 2400 / 64;
+            this.updateDetune(channel, note, pressure);
         }
         if (!note.portamento) {
             if (table[1] !== 64) {
-                this.setFilterEnvelope(channel, note);
+                const channelPressure = channel.channelPressureTable[1] *
+                    channel.state.channelPressure;
+                const polyphonicKeyPressure = (0 < note.pressure)
+                    ? channel.polyphonicKeyPressureTable[1] * note.pressure
+                    : 0;
+                const pressure = (channelPressure + polyphonicKeyPressure - 128) * 15;
+                this.setFilterEnvelope(channel, note, pressure);
             }
             if (table[2] !== 64) {
-                this.setVolumeEnvelope(channel, note);
+                const channelPressure = channel.channelPressureTable[2] *
+                    channel.state.channelPressure;
+                const polyphonicKeyPressure = (0 < note.pressure)
+                    ? channel.polyphonicKeyPressureTable[2] * note.pressure
+                    : 0;
+                const pressure = (channelPressure + polyphonicKeyPressure) / 128;
+                this.setVolumeEnvelope(channel, note, pressure);
             }
         }
         if (table[3] !== 0) {
-            this.setModLfoToPitch(channel, note);
+            const channelPressure = channel.channelPressureTable[3] *
+                channel.state.channelPressure;
+            const polyphonicKeyPressure = (0 < note.pressure)
+                ? channel.polyphonicKeyPressureTable[3] * note.pressure
+                : 0;
+            const pressure = (channelPressure + polyphonicKeyPressure) / 254 * 600;
+            this.setModLfoToPitch(channel, note, pressure);
         }
         if (table[4] !== 0) {
-            this.setModLfoToFilterFc(channel, note);
+            const channelPressure = channel.channelPressureTable[4] *
+                channel.state.channelPressure;
+            const polyphonicKeyPressure = (0 < note.pressure)
+                ? channel.polyphonicKeyPressureTable[4] * note.pressure
+                : 0;
+            const pressure = (channelPressure + polyphonicKeyPressure) / 254 * 2400;
+            this.setModLfoToFilterFc(note, pressure);
         }
         if (table[5] !== 0) {
-            this.setModLfoToVolume(channel, note);
+            const channelPressure = channel.channelPressureTable[5] *
+                channel.state.channelPressure;
+            const polyphonicKeyPressure = (0 < note.pressure)
+                ? channel.polyphonicKeyPressureTable[5] * note.pressure
+                : 0;
+            const pressure = (channelPressure + polyphonicKeyPressure) / 254;
+            this.setModLfoToVolume(note, pressure);
         }
     }
-    handleChannelPressureSysEx(data) {
+    handleChannelPressureSysEx(data, tableName) {
         const channelNumber = data[4];
-        const table = this.channels[channelNumber].pressureTable;
+        const table = this.channels[channelNumber][tableName];
         for (let i = 5; i < data.length - 1; i += 2) {
             const pp = data[i];
             const rr = data[i + 1];
@@ -2606,7 +2671,8 @@ Object.defineProperty(Midy, "channelSettings", {
         currentBufferSource: null,
         detune: 0,
         scaleOctaveTuningTable: new Array(12).fill(0), // cent
-        pressureTable: new Uint8Array([64, 64, 64, 0, 0, 0]),
+        channelPressureTable: new Uint8Array([64, 64, 64, 0, 0, 0]),
+        polyphonicKeyPressureTable: new Uint8Array([64, 64, 64, 0, 0, 0]),
         keyBasedInstrumentControlTable: new Int8Array(128 * 128), // [-64, 63]
         program: 0,
         bank: 121 * 128,
@@ -2621,16 +2687,3 @@ Object.defineProperty(Midy, "channelSettings", {
         modulationDepthRange: 50, // cent
     }
 });
-Object.defineProperty(Midy, "controllerDestinationSettings", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: {
-        pitchControl: 0,
-        filterCutoffControl: 0,
-        amplitudeControl: 1,
-        lfoPitchDepth: 0,
-        lfoFilterDepth: 0,
-        lfoAmplitudeDepth: 0,
-    }
-});