@marmooo/midy 0.2.3 → 0.2.4

package/esm/midy-GM1.d.ts

@@ -97,7 +97,8 @@ export class MidyGM1 {
     centToRate(cent: any): number;
     centToHz(cent: any): number;
     calcChannelDetune(channel: any): any;
-    updateDetune(channel: any): void;
+    updateChannelDetune(channel: any): void;
+    updateDetune(channel: any, note: any): void;
     setVolumeEnvelope(note: any): void;
     setPitchEnvelope(note: any): void;
     clampCutoffFrequency(frequency: any): number;

package/esm/midy-GM1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAqFA;IAoBE;;;;;;;;;;;;MAYE;IAEF,+BAQC;IAzCD,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;IAClB,iCAA8B;IAiB5B,kBAAgC;IAChC,kBAA8C;IAC9C;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,6DA2BC;IAED,iEAUC;IAED,2EA+CC;IAED,mCAOC;IAED,0BAkDC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,+EAmBC;IAED,qDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,iCAWC;IAED,mCAgBC;IAED,kCAqBC;IAED,6CAIC;IAED,mCAuBC;IAED,+DAoBC;IAED,gHA2BC;IAED,kGAgDC;IAED,0EAGC;IAED,qFA4BC;IAED,6HAuBC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,mDASC;IAED,gDASC;IAED,gDASC;IAED,qCAMC;IAED,mCAQC;IAED,gCAOC;IAED,+BAMC;IAED;;;;;;;;;;;MA4CC;IAED,oFAMC;IAED,0DA6CC;IAED;;;;;;;;;;;;;MAeC;IAED,+EAWC;IAED,qCAeC;IAED,8DAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,wCAWC;IAED,sDAKC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,kDAKC;IAED,wDASC;IAED,8CAKC;IAED,oDAOC;IAED,gDAKC;IAED,sDAOC;IAED,+CAEC;IAED,8CAqBC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAMC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAjzCD;IAUE,0FAMC;IAfD,kBAAa;IACb,gBAAW;IACX,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAChB,gBAAW;IACX,kBAAa;IAGX,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}
+{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAqFA;IAoBE;;;;;;;;;;;;MAYE;IAEF,+BAQC;IAzCD,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;IAClB,iCAA8B;IAiB5B,kBAAgC;IAChC,kBAA8C;IAC9C;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,6DA2BC;IAED,iEAUC;IAED,2EA+CC;IAED,mCAOC;IAED,0BAkDC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,+EAmBC;IAED,qDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,wCAQC;IAED,4CAKC;IAED,mCAgBC;IAED,kCAqBC;IAED,6CAIC;IAED,mCAuBC;IAED,+DAoBC;IAED,gHA2BC;IAED,kGAgDC;IAED,0EAGC;IAED,qFA4BC;IAED,6HAuBC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,mDASC;IAED,gDASC;IAED,gDASC;IAED,qCAMC;IAED,mCAQC;IAED,gCAOC;IAED,+BAMC;IAED;;;;;;;;;;;MA4CC;IAED,oFAMC;IAED,0DA6CC;IAED;;;;;;;;;;;;;MAeC;IAED,+EAWC;IAED,qCAeC;IAED,8DAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,wCAWC;IAED,sDAKC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,kDAKC;IAED,wDASC;IAED,8CAKC;IAED,oDAOC;IAED,gDAKC;IAED,sDAOC;IAED,+CAEC;IAED,8CAqBC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAMC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AArzCD;IAUE,0FAMC;IAfD,kBAAa;IACb,gBAAW;IACX,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAChB,gBAAW;IACX,kBAAa;IAGX,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}

package/esm/midy-GM1.js

@@ -609,19 +609,22 @@ export class MidyGM1 {
         const pitch = pitchWheel * pitchWheelSensitivity;
         return tuning + pitch;
     }
-    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;
-                note.bufferSource.detune
-                    .cancelScheduledValues(now)
-                    .setValueAtTime(channel.detune, now);
+                this.updateDetune(channel, note);
             }
         });
     }
+    updateDetune(channel, note) {
+        const now = this.audioContext.currentTime;
+        note.bufferSource.detune
+            .cancelScheduledValues(now)
+            .setValueAtTime(channel.detune, now);
+    }
     setVolumeEnvelope(note) {
         const now = this.audioContext.currentTime;
         const { voiceParams, startTime } = note;
@@ -874,7 +877,7 @@ export class MidyGM1 {
         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) {
@@ -972,7 +975,7 @@ export class MidyGM1 {
                     const freqVibLFO = note.voiceParams.freqVibLFO;
                     note.vibratoLFO.frequency
                         .cancelScheduledValues(now)
-                        .setValueAtTime(freqVibLFO * channel.state.vibratoRate, now);
+                        .setValueAtTime(freqVibLFO * channel.state.vibratoRate * 2, now);
                 }
             },
         };
@@ -1012,7 +1015,7 @@ export class MidyGM1 {
                             if (key in voiceParams)
                                 noteVoiceParams[key] = voiceParams[key];
                         }
-                        this.setFilterEnvelope(channel, note);
+                        this.setFilterEnvelope(note);
                         this.setPitchEnvelope(note);
                     }
                     else if (volumeEnvelopeKeySet.has(key)) {
@@ -1052,7 +1055,7 @@ export class MidyGM1 {
         if (handler) {
             handler.call(this, channelNumber, value);
             const channel = this.channels[channelNumber];
-            this.applyVoiceParams(channel, controller + 128);
+            this.applyVoiceParams(channel, controllerType + 128);
         }
         else {
             console.warn(`Unsupported Control change: controllerType=${controllerType} value=${value}`);
@@ -1191,7 +1194,7 @@ export class MidyGM1 {
         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) {
@@ -1206,7 +1209,7 @@ export class MidyGM1 {
         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];
@@ -1220,7 +1223,7 @@ export class MidyGM1 {
         const next = (value - 64) * 100; // cent
         channel.coarseTuning = next;
         channel.detune += next - prev;
-        this.updateDetune(channel);
+        this.updateChannelDetune(channel);
     }
     allSoundOff(channelNumber) {
         return this.stopChannelNotes(channelNumber, 0, true);
@@ -1236,7 +1239,7 @@ export class MidyGM1 {
         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",

package/esm/midy-GM2.d.ts

@@ -3,7 +3,7 @@ export class MidyGM2 {
         currentBufferSource: null;
         detune: number;
         scaleOctaveTuningTable: any[];
-        pressureTable: Uint8Array<ArrayBuffer>;
+        channelPressureTable: Uint8Array<ArrayBuffer>;
         keyBasedInstrumentControlTable: Int8Array<ArrayBuffer>;
         program: number;
         bank: number;
@@ -17,14 +17,6 @@ export class MidyGM2 {
         coarseTuning: number;
         modulationDepthRange: number;
     };
-    static controllerDestinationSettings: {
-        pitchControl: number;
-        filterCutoffControl: number;
-        amplitudeControl: number;
-        lfoPitchDepth: number;
-        lfoFilterDepth: number;
-        lfoAmplitudeDepth: number;
-    };
     constructor(audioContext: any, options?: {
         reverbAlgorithm: (audioContext: any) => {
             input: any;
@@ -191,14 +183,15 @@ export class MidyGM2 {
     centToHz(cent: any): number;
     calcChannelDetune(channel: any): any;
     calcNoteDetune(channel: any, note: any): any;
-    updateDetune(channel: any): void;
+    updateChannelDetune(channel: any): void;
+    updateDetune(channel: any, note: any, pressure: any): void;
     getPortamentoTime(channel: any): number;
     setPortamentoStartVolumeEnvelope(channel: any, note: any): void;
-    setVolumeEnvelope(channel: any, note: any): void;
+    setVolumeEnvelope(note: any, pressure: any): void;
     setPitchEnvelope(note: any): void;
     clampCutoffFrequency(frequency: any): number;
     setPortamentoStartFilterEnvelope(channel: any, note: any): void;
-    setFilterEnvelope(channel: any, note: any): void;
+    setFilterEnvelope(channel: any, note: any, pressure: any): void;
     startModulation(channel: any, note: any, startTime: any): void;
     startVibrato(channel: any, note: any, startTime: any): void;
     createNote(channel: any, voice: any, noteNumber: any, velocity: any, startTime: any, portamento: any, isSF3: any): Promise<Note>;
@@ -213,17 +206,17 @@ export class MidyGM2 {
     handleMIDIMessage(statusByte: any, data1: any, data2: any): void | Promise<any>;
     handleProgramChange(channelNumber: any, program: any): void;
     handleChannelPressure(channelNumber: any, value: any): void;
-    setChannelPressure(channel: any, note: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
     setPitchBend(channelNumber: any, value: any): void;
-    setModLfoToPitch(channel: any, note: any): void;
+    setModLfoToPitch(channel: any, note: any, pressure: any): void;
     setVibLfoToPitch(channel: any, note: any): void;
-    setModLfoToFilterFc(channel: any, note: any): void;
-    setModLfoToVolume(channel: any, note: any): void;
+    setModLfoToFilterFc(note: any, pressure: any): void;
+    setModLfoToVolume(note: any, pressure: any): void;
     setReverbEffectsSend(channel: any, note: any, prevValue: any): void;
     setChorusEffectsSend(channel: any, note: any, prevValue: any): void;
     setDelayModLFO(note: any): void;
     setFreqModLFO(note: any): void;
+    setFreqVibLFO(channel: any, note: any): void;
     createVoiceParamsHandlers(): {
         modLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
         vibLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
@@ -311,7 +304,7 @@ export class MidyGM2 {
     handleUniversalNonRealTimeExclusiveMessage(data: any): void;
     GM1SystemOn(): void;
     GM2SystemOn(): void;
-    handleUniversalRealTimeExclusiveMessage(data: any): void;
+    handleUniversalRealTimeExclusiveMessage(data: any): any;
     handleMasterVolumeSysEx(data: any): void;
     setMasterVolume(volume: any): void;
     handleMasterFineTuningSysEx(data: any): void;
@@ -339,14 +332,14 @@ export class MidyGM2 {
     getChannelBitmap(data: any): any[];
     handleScaleOctaveTuning1ByteFormatSysEx(data: any): void;
     applyDestinationSettings(channel: any, note: any, table: any): void;
-    handleChannelPressureSysEx(data: any): void;
+    handleChannelPressureSysEx(data: any, tableName: any): void;
     initControlTable(): Uint8Array<ArrayBuffer>;
     applyControlTable(channel: any, controllerType: any): void;
     handleControlChangeSysEx(data: any): void;
     getKeyBasedInstrumentControlValue(channel: any, keyNumber: any, controllerType: any): number;
     handleKeyBasedInstrumentControlSysEx(data: any): void;
     handleExclusiveMessage(data: any): void;
-    handleSysEx(data: any): void;
+    handleSysEx(data: any): any;
     scheduleTask(callback: any, startTime: any): Promise<any>;
 }
 declare class Note {

package/esm/midy-GM2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"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"}

package/esm/midy-GM2.js

@@ -97,7 +97,6 @@ class Note {
 const defaultControllerState = {
     noteOnVelocity: { type: 2, defaultValue: 0 },
     noteOnKeyNumber: { type: 3, defaultValue: 0 },
-    polyPressure: { type: 10, defaultValue: 0 },
     channelPressure: { type: 13, defaultValue: 0 },
     pitchWheel: { type: 14, defaultValue: 8192 / 16383 },
     pitchWheelSensitivity: { type: 16, defaultValue: 2 / 128 },
@@ -429,9 +428,6 @@ export class MidyGM2 {
                 ...this.setChannelAudioNodes(audioContext),
                 scheduledNotes: new Map(),
                 sostenutoNotes: new Map(),
-                channelPressure: {
-                    ...this.constructor.controllerDestinationSettings,
-                },
             };
         });
         return channels;
@@ -933,28 +929,31 @@ export class MidyGM2 {
         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;
@@ -972,14 +971,11 @@ export class MidyGM2 {
             .setValueAtTime(0, volDelay)
             .linearRampToValueAtTime(sustainVolume, portamentoTime);
     }
-    setVolumeEnvelope(channel, note) {
+    setVolumeEnvelope(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;
@@ -1027,10 +1023,8 @@ export class MidyGM2 {
         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;
         const peekFreq = this.centToHz(voiceParams.initialFilterFc + voiceParams.modEnvToFilterFc) * softPedalFactor;
         const sustainFreq = baseFreq +
             (peekFreq - baseFreq) * (1 - voiceParams.modSustain);
@@ -1044,15 +1038,16 @@ export class MidyGM2 {
             .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;
+        const peekFreq = this.centToHz(baseCent + voiceParams.modEnvToFilterFc) *
             softPedalFactor;
-        const peekFreq = this.centToHz(voiceParams.initialFilterFc + voiceParams.modEnvToFilterFc) * softPedalFactor;
         const sustainFreq = baseFreq +
             (peekFreq - baseFreq) * (1 - voiceParams.modSustain);
         const adjustedBaseFreq = this.clampCutoffFrequency(baseFreq);
@@ -1079,9 +1074,9 @@ export class MidyGM2 {
             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);
@@ -1094,8 +1089,7 @@ export class MidyGM2 {
         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);
@@ -1124,8 +1118,8 @@ export class MidyGM2 {
         }
         else {
             note.portamento = false;
-            this.setVolumeEnvelope(channel, note);
-            this.setFilterEnvelope(channel, note);
+            this.setVolumeEnvelope(note, 0);
+            this.setFilterEnvelope(channel, note, 0);
         }
         if (0 < state.vibratoDepth) {
             this.startVibrato(channel, note, startTime);
@@ -1344,11 +1338,11 @@ export class MidyGM2 {
         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];
@@ -1359,28 +1353,6 @@ export class MidyGM2 {
         });
         // this.applyVoiceParams(channel, 13);
     }
-    setChannelPressure(channel, note) {
-        if (channel.pressureTable[0] !== 64) {
-            this.updateDetune(channel);
-        }
-        if (!note.portamento) {
-            if (channel.pressureTable[1] !== 64) {
-                this.setFilterEnvelope(channel, note);
-            }
-            if (channel.pressureTable[2] !== 64) {
-                this.setVolumeEnvelope(channel, note);
-            }
-        }
-        if (channel.pressureTable[3] !== 0) {
-            this.setModLfoToPitch(channel, note);
-        }
-        if (channel.pressureTable[4] !== 0) {
-            this.setModLfoToFilterFc(channel, note);
-        }
-        if (channel.pressureTable[5] !== 0) {
-            this.setModLfoToVolume(channel, note);
-        }
-    }
     handlePitchBendMessage(channelNumber, lsb, msb) {
         const pitchBend = msb * 128 + lsb;
         this.setPitchBend(channelNumber, pitchBend);
@@ -1392,16 +1364,13 @@ export class MidyGM2 {
         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)
@@ -1417,22 +1386,18 @@ export class MidyGM2 {
             .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);
@@ -1505,11 +1470,18 @@ export class MidyGM2 {
             .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) => {
@@ -1519,12 +1491,12 @@ export class MidyGM2 {
             },
             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) => {
@@ -1550,11 +1522,7 @@ export class MidyGM2 {
             },
             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);
                 }
             },
         };
@@ -1598,7 +1566,7 @@ export class MidyGM2 {
                             this.setPortamentoStartFilterEnvelope(channel, note);
                         }
                         else {
-                            this.setFilterEnvelope(channel, note);
+                            this.setFilterEnvelope(channel, note, 0);
                         }
                         this.setPitchEnvelope(note);
                     }
@@ -1612,7 +1580,7 @@ export class MidyGM2 {
                             if (key in voiceParams)
                                 noteVoiceParams[key] = voiceParams[key];
                         }
-                        this.setVolumeEnvelope(channel, note);
+                        this.setVolumeEnvelope(note, 0);
                     }
                 }
             }
@@ -1651,7 +1619,7 @@ export class MidyGM2 {
         if (handler) {
             handler.call(this, channelNumber, value);
             const channel = this.channels[channelNumber];
-            this.applyVoiceParams(channel, controller + 128);
+            this.applyVoiceParams(channel, controllerType + 128);
             this.applyControlTable(channel, controllerType);
         }
         else {
@@ -1944,7 +1912,7 @@ export class MidyGM2 {
         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) {
@@ -1959,7 +1927,7 @@ export class MidyGM2 {
         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];
@@ -1973,7 +1941,7 @@ export class MidyGM2 {
         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];
@@ -2004,7 +1972,7 @@ export class MidyGM2 {
         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",
@@ -2098,7 +2066,7 @@ export class MidyGM2 {
             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 3: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca22.pdf
                         return this.handleControlChangeSysEx(data);
                     default:
@@ -2140,7 +2108,7 @@ export class MidyGM2 {
         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];
@@ -2151,7 +2119,7 @@ export class MidyGM2 {
         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) {
@@ -2375,29 +2343,44 @@ export class MidyGM2 {
     }
     applyDestinationSettings(channel, note, table) {
         if (table[0] !== 64) {
-            this.updateDetune(channel);
+            this.updateDetune(channel, note, 0);
         }
         if (!note.portamento) {
             if (table[1] !== 64) {
-                this.setFilterEnvelope(channel, note);
+                const channelPressure = channel.channelPressureTable[1] *
+                    channel.state.channelPressure;
+                const pressure = (channelPressure - 64) * 15;
+                this.setFilterEnvelope(channel, note, pressure);
             }
             if (table[2] !== 64) {
-                this.setVolumeEnvelope(channel, note);
+                const channelPressure = channel.channelPressureTable[2] *
+                    channel.state.channelPressure;
+                const pressure = channelPressure / 64;
+                this.setVolumeEnvelope(note, pressure);
             }
         }
         if (table[3] !== 0) {
-            this.setModLfoToPitch(channel, note);
+            const channelPressure = channel.channelPressureTable[3] *
+                channel.state.channelPressure;
+            const pressure = channelPressure / 127 * 600;
+            this.setModLfoToPitch(channel, note, pressure);
         }
         if (table[4] !== 0) {
-            this.setModLfoToFilterFc(channel, note);
+            const channelPressure = channel.channelPressureTable[4] *
+                channel.state.channelPressure;
+            const pressure = channelPressure / 127 * 2400;
+            this.setModLfoToFilterFc(note, pressure);
         }
         if (table[5] !== 0) {
-            this.setModLfoToVolume(channel, note);
+            const channelPressure = channel.channelPressureTable[5] *
+                channel.state.channelPressure;
+            const pressure = channelPressure / 127;
+            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];
@@ -2488,7 +2471,7 @@ Object.defineProperty(MidyGM2, "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]),
         keyBasedInstrumentControlTable: new Int8Array(128 * 128), // [-64, 63]
         program: 0,
         bank: 121 * 128,
@@ -2503,16 +2486,3 @@ Object.defineProperty(MidyGM2, "channelSettings", {
         modulationDepthRange: 50, // cent
     }
 });
-Object.defineProperty(MidyGM2, "controllerDestinationSettings", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: {
-        pitchControl: 0,
-        filterCutoffControl: 0,
-        amplitudeControl: 1,
-        lfoPitchDepth: 0,
-        lfoFilterDepth: 0,
-        lfoAmplitudeDepth: 0,
-    }
-});