@marmooo/midy 0.3.3 → 0.3.5

package/esm/midy.js

@@ -44,24 +44,6 @@ class Note {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "volumeNode", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "gainL", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "gainR", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         Object.defineProperty(this, "modulationLFO", {
             enumerable: true,
             configurable: true,
@@ -214,6 +196,16 @@ class ControllerState {
         }
     }
 }
+const volumeEnvelopeKeys = [
+    "volDelay",
+    "volAttack",
+    "volHold",
+    "volDecay",
+    "volSustain",
+    "volRelease",
+    "initialAttenuation",
+];
+const volumeEnvelopeKeySet = new Set(volumeEnvelopeKeys);
 const filterEnvelopeKeys = [
     "modEnvToPitch",
     "initialFilterFc",
@@ -223,22 +215,20 @@ const filterEnvelopeKeys = [
     "modHold",
     "modDecay",
     "modSustain",
-    "modRelease",
-    "playbackRate",
 ];
 const filterEnvelopeKeySet = new Set(filterEnvelopeKeys);
-const volumeEnvelopeKeys = [
-    "volDelay",
-    "volAttack",
-    "volHold",
-    "volDecay",
-    "volSustain",
-    "volRelease",
-    "initialAttenuation",
+const pitchEnvelopeKeys = [
+    "modEnvToPitch",
+    "modDelay",
+    "modAttack",
+    "modHold",
+    "modDecay",
+    "modSustain",
+    "playbackRate",
 ];
-const volumeEnvelopeKeySet = new Set(volumeEnvelopeKeys);
+const pitchEnvelopeKeySet = new Set(pitchEnvelopeKeys);
 export class Midy {
-    constructor(audioContext, options = this.defaultOptions) {
+    constructor(audioContext) {
         Object.defineProperty(this, "mode", {
             enumerable: true,
             configurable: true,
@@ -262,6 +252,7 @@ export class Midy {
             configurable: true,
             writable: true,
             value: {
+                algorithm: "SchroederReverb",
                 time: this.getReverbTime(64),
                 feedback: 0.8,
             }
@@ -338,13 +329,13 @@ export class Midy {
             writable: true,
             value: this.initSoundFontTable()
         });
-        Object.defineProperty(this, "audioBufferCounter", {
+        Object.defineProperty(this, "voiceCounter", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: new Map()
         });
-        Object.defineProperty(this, "audioBufferCache", {
+        Object.defineProperty(this, "voiceCache", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -410,30 +401,7 @@ export class Midy {
             writable: true,
             value: new Array(this.numChannels * drumExclusiveClassCount)
         });
-        Object.defineProperty(this, "defaultOptions", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: {
-                reverbAlgorithm: (audioContext) => {
-                    const { time: rt60, feedback } = this.reverb;
-                    // const delay = this.calcDelay(rt60, feedback);
-                    // const impulse = this.createConvolutionReverbImpulse(
-                    //   audioContext,
-                    //   rt60,
-                    //   delay,
-                    // );
-                    // return this.createConvolutionReverb(audioContext, impulse);
-                    const combFeedbacks = this.generateDistributedArray(feedback, 4);
-                    const combDelays = combFeedbacks.map((feedback) => this.calcDelay(rt60, feedback));
-                    const allpassFeedbacks = this.generateDistributedArray(feedback, 4);
-                    const allpassDelays = allpassFeedbacks.map((feedback) => this.calcDelay(rt60, feedback));
-                    return this.createSchroederReverb(audioContext, combFeedbacks, combDelays, allpassFeedbacks, allpassDelays);
-                },
-            }
-        });
         this.audioContext = audioContext;
-        this.options = { ...this.defaultOptions, ...options };
         this.masterVolume = new GainNode(audioContext);
         this.scheduler = new GainNode(audioContext, { gain: 0 });
         this.schedulerBuffer = new AudioBuffer({
@@ -443,7 +411,7 @@ export class Midy {
         this.voiceParamsHandlers = this.createVoiceParamsHandlers();
         this.controlChangeHandlers = this.createControlChangeHandlers();
         this.channels = this.createChannels(audioContext);
-        this.reverbEffect = this.options.reverbAlgorithm(audioContext);
+        this.reverbEffect = this.createReverbEffect(audioContext);
         this.chorusEffect = this.createChorusEffect(audioContext);
         this.chorusEffect.output.connect(this.masterVolume);
         this.reverbEffect.output.connect(this.masterVolume);
@@ -464,13 +432,11 @@ export class Midy {
         const presetHeaders = soundFont.parsed.presetHeaders;
         for (let i = 0; i < presetHeaders.length; i++) {
             const presetHeader = presetHeaders[i];
-            if (!presetHeader.presetName.startsWith("\u0000")) { // TODO: Only SF3 generated by PolyPone?
-                const banks = this.soundFontTable[presetHeader.preset];
-                banks.set(presetHeader.bank, index);
-            }
+            const banks = this.soundFontTable[presetHeader.preset];
+            banks.set(presetHeader.bank, index);
         }
     }
-    async loadSoundFont(input) {
+    async toUint8Array(input) {
         let uint8Array;
         if (typeof input === "string") {
             const response = await fetch(input);
@@ -483,23 +449,32 @@ export class Midy {
         else {
             throw new TypeError("input must be a URL string or Uint8Array");
         }
-        const parsed = parse(uint8Array);
-        const soundFont = new SoundFont(parsed);
-        this.addSoundFont(soundFont);
+        return uint8Array;
     }
-    async loadMIDI(input) {
-        let uint8Array;
-        if (typeof input === "string") {
-            const response = await fetch(input);
-            const arrayBuffer = await response.arrayBuffer();
-            uint8Array = new Uint8Array(arrayBuffer);
-        }
-        else if (input instanceof Uint8Array) {
-            uint8Array = input;
+    async loadSoundFont(input) {
+        this.voiceCounter.clear();
+        if (Array.isArray(input)) {
+            const promises = new Array(input.length);
+            for (let i = 0; i < input.length; i++) {
+                promises[i] = this.toUint8Array(input[i]);
+            }
+            const uint8Arrays = await Promise.all(promises);
+            for (let i = 0; i < uint8Arrays.length; i++) {
+                const parsed = parse(uint8Arrays[i]);
+                const soundFont = new SoundFont(parsed);
+                this.addSoundFont(soundFont);
+            }
         }
         else {
-            throw new TypeError("input must be a URL string or Uint8Array");
+            const uint8Array = await this.toUint8Array(input);
+            const parsed = parse(uint8Array);
+            const soundFont = new SoundFont(parsed);
+            this.addSoundFont(soundFont);
         }
+    }
+    async loadMIDI(input) {
+        this.voiceCounter.clear();
+        const uint8Array = await this.toUint8Array(input);
         const midi = parseMidi(uint8Array);
         this.ticksPerBeat = midi.header.ticksPerBeat;
         const midiData = this.extractMidiData(midi);
@@ -507,7 +482,46 @@ export class Midy {
         this.timeline = midiData.timeline;
         this.totalTime = this.calcTotalTime();
     }
-    setChannelAudioNodes(audioContext) {
+    cacheVoiceIds() {
+        const timeline = this.timeline;
+        for (let i = 0; i < timeline.length; i++) {
+            const event = timeline[i];
+            switch (event.type) {
+                case "noteOn": {
+                    const audioBufferId = this.getVoiceId(this.channels[event.channel], event.noteNumber, event.velocity);
+                    this.voiceCounter.set(audioBufferId, (this.voiceCounter.get(audioBufferId) ?? 0) + 1);
+                    break;
+                }
+                case "controller":
+                    if (event.controllerType === 0) {
+                        this.setBankMSB(event.channel, event.value);
+                    }
+                    else if (event.controllerType === 32) {
+                        this.setBankLSB(event.channel, event.value);
+                    }
+                    break;
+                case "programChange":
+                    this.setProgramChange(event.channel, event.programNumber, event.startTime);
+            }
+        }
+        for (const [audioBufferId, count] of this.voiceCounter) {
+            if (count === 1)
+                this.voiceCounter.delete(audioBufferId);
+        }
+        this.GM2SystemOn();
+    }
+    getVoiceId(channel, noteNumber, velocity) {
+        const bankNumber = this.calcBank(channel);
+        const soundFontIndex = this.soundFontTable[channel.programNumber]
+            .get(bankNumber);
+        if (soundFontIndex === undefined)
+            return;
+        const soundFont = this.soundFonts[soundFontIndex];
+        const voice = soundFont.getVoice(bankNumber, channel.programNumber, noteNumber, velocity);
+        const { instrument, sampleID } = voice.generators;
+        return `${soundFontIndex}:${instrument}:${sampleID}`;
+    }
+    createChannelAudioNodes(audioContext) {
         const { gainLeft, gainRight } = this.panToGain(defaultControllerState.pan.defaultValue);
         const gainL = new GainNode(audioContext, { gain: gainLeft });
         const gainR = new GainNode(audioContext, { gain: gainRight });
@@ -522,10 +536,10 @@ export class Midy {
         };
     }
     resetChannelTable(channel) {
-        this.resetControlTable(channel.controlTable);
+        channel.controlTable.fill(-1);
         channel.scaleOctaveTuningTable.fill(0); // [-100, 100] cent
-        channel.channelPressureTable.set([64, 64, 64, 0, 0, 0]);
-        channel.polyphonicKeyPressureTable.set([64, 64, 64, 0, 0, 0]);
+        channel.channelPressureTable.fill(-1);
+        channel.polyphonicKeyPressureTable.fill(-1);
         channel.keyBasedInstrumentControlTable.fill(-1);
     }
     createChannels(audioContext) {
@@ -535,47 +549,27 @@ export class Midy {
                 isDrum: false,
                 state: new ControllerState(),
                 ...this.constructor.channelSettings,
-                ...this.setChannelAudioNodes(audioContext),
+                ...this.createChannelAudioNodes(audioContext),
                 scheduledNotes: [],
                 sustainNotes: [],
                 sostenutoNotes: [],
                 controlTable: this.initControlTable(),
                 scaleOctaveTuningTable: new Float32Array(12), // [-100, 100] cent
-                channelPressureTable: new Uint8Array([64, 64, 64, 0, 0, 0]),
-                polyphonicKeyPressureTable: new Uint8Array([64, 64, 64, 0, 0, 0]),
+                channelPressureTable: new Int8Array(6).fill(-1),
+                polyphonicKeyPressureTable: new Int8Array(6).fill(-1),
                 keyBasedInstrumentControlTable: new Int8Array(128 * 128).fill(-1),
+                keyBasedGainLs: new Array(128),
+                keyBasedGainRs: new Array(128),
             };
         });
         return channels;
     }
-    async createNoteBuffer(voiceParams, isSF3) {
+    async createAudioBuffer(voiceParams) {
+        const sample = voiceParams.sample;
         const sampleStart = voiceParams.start;
-        const sampleEnd = voiceParams.sample.length + voiceParams.end;
-        if (isSF3) {
-            const sample = voiceParams.sample;
-            const start = sample.byteOffset + sampleStart;
-            const end = sample.byteOffset + sampleEnd;
-            const buffer = sample.buffer.slice(start, end);
-            const audioBuffer = await this.audioContext.decodeAudioData(buffer);
-            return audioBuffer;
-        }
-        else {
-            const sample = voiceParams.sample;
-            const start = sample.byteOffset + sampleStart;
-            const end = sample.byteOffset + sampleEnd;
-            const buffer = sample.buffer.slice(start, end);
-            const audioBuffer = new AudioBuffer({
-                numberOfChannels: 1,
-                length: sample.length,
-                sampleRate: voiceParams.sampleRate,
-            });
-            const channelData = audioBuffer.getChannelData(0);
-            const int16Array = new Int16Array(buffer);
-            for (let i = 0; i < int16Array.length; i++) {
-                channelData[i] = int16Array[i] / 32768;
-            }
-            return audioBuffer;
-        }
+        const sampleEnd = sample.data.length + voiceParams.end;
+        const audioBuffer = await sample.toAudioBuffer(this.audioContext, sampleStart, sampleEnd);
+        return audioBuffer;
     }
     isLoopDrum(channel, noteNumber) {
         const programNumber = channel.programNumber;
@@ -585,10 +579,9 @@ export class Midy {
     createBufferSource(channel, noteNumber, voiceParams, audioBuffer) {
         const bufferSource = new AudioBufferSourceNode(this.audioContext);
         bufferSource.buffer = audioBuffer;
-        bufferSource.loop = voiceParams.sampleModes % 2 !== 0;
-        if (channel.isDrum) {
-            bufferSource.loop = this.isLoopDrum(channel, noteNumber);
-        }
+        bufferSource.loop = channel.isDrum
+            ? this.isLoopDrum(channel, noteNumber)
+            : (voiceParams.sampleModes % 2 !== 0);
         if (bufferSource.loop) {
             bufferSource.loopStart = voiceParams.loopStart / voiceParams.sampleRate;
             bufferSource.loopEnd = voiceParams.loopEnd / voiceParams.sampleRate;
@@ -613,16 +606,16 @@ export class Midy {
                     break;
                 }
                 case "noteAftertouch":
-                    this.handlePolyphonicKeyPressure(event.channel, event.noteNumber, event.amount, startTime);
+                    this.setPolyphonicKeyPressure(event.channel, event.noteNumber, event.amount, startTime);
                     break;
                 case "controller":
-                    this.handleControlChange(event.channel, event.controllerType, event.value, startTime);
+                    this.setControlChange(event.channel, event.controllerType, event.value, startTime);
                     break;
                 case "programChange":
-                    this.handleProgramChange(event.channel, event.programNumber, startTime);
+                    this.setProgramChange(event.channel, event.programNumber, startTime);
                     break;
                 case "channelAftertouch":
-                    this.handleChannelPressure(event.channel, event.amount, startTime);
+                    this.setChannelPressure(event.channel, event.amount, startTime);
                     break;
                 case "pitchBend":
                     this.setPitchBend(event.channel, event.value + 8192, startTime);
@@ -656,8 +649,9 @@ export class Midy {
                     this.notePromises = [];
                     this.exclusiveClassNotes.fill(undefined);
                     this.drumExclusiveClassNotes.fill(undefined);
-                    this.audioBufferCache.clear();
+                    this.voiceCache.clear();
                     for (let i = 0; i < this.channels.length; i++) {
+                        this.channels[i].scheduledNotes = [];
                         this.resetAllStates(i);
                     }
                     resolve();
@@ -679,8 +673,9 @@ export class Midy {
                     this.notePromises = [];
                     this.exclusiveClassNotes.fill(undefined);
                     this.drumExclusiveClassNotes.fill(undefined);
-                    this.audioBufferCache.clear();
+                    this.voiceCache.clear();
                     for (let i = 0; i < this.channels.length; i++) {
+                        this.channels[i].scheduledNotes = [];
                         this.resetAllStates(i);
                     }
                     this.isStopping = false;
@@ -713,11 +708,7 @@ export class Midy {
     secondToTicks(second, secondsPerBeat) {
         return second * this.ticksPerBeat / secondsPerBeat;
     }
-    getAudioBufferId(programNumber, noteNumber, velocity) {
-        return `${programNumber}:${noteNumber}:${velocity}`;
-    }
     extractMidiData(midi) {
-        this.audioBufferCounter.clear();
         const instruments = new Set();
         const timeline = [];
         const tmpChannels = new Array(this.channels.length);
@@ -738,8 +729,6 @@ export class Midy {
                 switch (event.type) {
                     case "noteOn": {
                         const channel = tmpChannels[event.channel];
-                        const audioBufferId = this.getAudioBufferId(channel.programNumber, event.noteNumber, event.velocity);
-                        this.audioBufferCounter.set(audioBufferId, (this.audioBufferCounter.get(audioBufferId) ?? 0) + 1);
                         if (channel.programNumber < 0) {
                             channel.programNumber = event.programNumber;
                             switch (channel.bankMSB) {
@@ -789,10 +778,6 @@ export class Midy {
                 timeline.push(event);
             }
         }
-        for (const [audioBufferId, count] of this.audioBufferCounter) {
-            if (count === 1)
-                this.audioBufferCounter.delete(audioBufferId);
-        }
         const priority = {
             controller: 0,
             sysEx: 1,
@@ -837,7 +822,6 @@ export class Midy {
             this.notePromises.push(promise);
             promises.push(promise);
         });
-        channel.scheduledNotes = [];
         return Promise.all(promises);
     }
     stopNotes(velocity, force, scheduleTime) {
@@ -851,6 +835,8 @@ export class Midy {
         if (this.isPlaying || this.isPaused)
             return;
         this.resumeTime = 0;
+        if (this.voiceCounter.size === 0)
+            this.cacheVoiceIds();
         await this.playNotes();
         this.isPlaying = false;
     }
@@ -893,7 +879,7 @@ export class Midy {
     }
     processScheduledNotes(channel, callback) {
         const scheduledNotes = channel.scheduledNotes;
-        for (let i = 0; i < scheduledNotes.length; i++) {
+        for (let i = channel.scheduleIndex; i < scheduledNotes.length; i++) {
             const note = scheduledNotes[i];
             if (!note)
                 continue;
@@ -904,14 +890,14 @@ export class Midy {
     }
     processActiveNotes(channel, scheduleTime, callback) {
         const scheduledNotes = channel.scheduledNotes;
-        for (let i = 0; i < scheduledNotes.length; i++) {
+        for (let i = channel.scheduleIndex; i < scheduledNotes.length; i++) {
             const note = scheduledNotes[i];
             if (!note)
                 continue;
             if (note.ending)
                 continue;
             if (scheduleTime < note.startTime)
-                continue;
+                break;
             callback(note);
         }
     }
@@ -1000,6 +986,22 @@ export class Midy {
         const output = allpasses.at(-1);
         return { input, output };
     }
+    createReverbEffect(audioContext) {
+        const { algorithm, time: rt60, feedback } = this.reverb;
+        switch (algorithm) {
+            case "ConvolutionReverb": {
+                const impulse = this.createConvolutionReverbImpulse(audioContext, rt60, this.calcDelay(rt60, feedback));
+                return this.createConvolutionReverb(audioContext, impulse);
+            }
+            case "SchroederReverb": {
+                const combFeedbacks = this.generateDistributedArray(feedback, 4);
+                const combDelays = combFeedbacks.map((feedback) => this.calcDelay(rt60, feedback));
+                const allpassFeedbacks = this.generateDistributedArray(feedback, 4);
+                const allpassDelays = allpassFeedbacks.map((feedback) => this.calcDelay(rt60, feedback));
+                return this.createSchroederReverb(audioContext, combFeedbacks, combDelays, allpassFeedbacks, allpassDelays);
+            }
+        }
+    }
     createChorusEffect(audioContext) {
         const input = new GainNode(audioContext);
         const output = new GainNode(audioContext);
@@ -1064,9 +1066,16 @@ export class Midy {
         const pitchWheel = channel.state.pitchWheel * 2 - 1;
         const pitchWheelSensitivity = channel.state.pitchWheelSensitivity * 12800;
         const pitch = pitchWheel * pitchWheelSensitivity;
-        const pressureDepth = (channel.channelPressureTable[0] - 64) / 37.5; // 2400 / 64;
-        const pressure = pressureDepth * channel.state.channelPressure;
-        return tuning + pitch + pressure;
+        const channelPressureRaw = channel.channelPressureTable[0];
+        if (0 <= channelPressureRaw) {
+            const channelPressureDepth = (channelPressureRaw - 64) / 37.5; // 2400 / 64;
+            const channelPressure = channelPressureDepth *
+                channel.state.channelPressure;
+            return tuning + pitch + channelPressure;
+        }
+        else {
+            return tuning + pitch;
+        }
     }
     calcNoteDetune(channel, note) {
         return channel.scaleOctaveTuningTable[note.noteNumber % 12];
@@ -1300,35 +1309,32 @@ export class Midy {
         note.vibratoLFO.connect(note.vibratoDepth);
         note.vibratoDepth.connect(note.bufferSource.detune);
     }
-    async getAudioBuffer(programNumber, noteNumber, velocity, voiceParams, isSF3) {
-        const audioBufferId = this.getAudioBufferId(programNumber, noteNumber, velocity);
-        const cache = this.audioBufferCache.get(audioBufferId);
+    async getAudioBuffer(channel, noteNumber, velocity, voiceParams) {
+        const audioBufferId = this.getVoiceId(channel, noteNumber, velocity);
+        const cache = this.voiceCache.get(audioBufferId);
         if (cache) {
             cache.counter += 1;
             if (cache.maxCount <= cache.counter) {
-                this.audioBufferCache.delete(audioBufferId);
+                this.voiceCache.delete(audioBufferId);
             }
             return cache.audioBuffer;
         }
         else {
-            const maxCount = this.audioBufferCounter.get(audioBufferId) ?? 0;
-            const audioBuffer = await this.createNoteBuffer(voiceParams, isSF3);
+            const maxCount = this.voiceCounter.get(audioBufferId) ?? 0;
+            const audioBuffer = await this.createAudioBuffer(voiceParams);
             const cache = { audioBuffer, maxCount, counter: 1 };
-            this.audioBufferCache.set(audioBufferId, cache);
+            this.voiceCache.set(audioBufferId, cache);
             return audioBuffer;
         }
     }
-    async createNote(channel, voice, noteNumber, velocity, startTime, isSF3) {
+    async createNote(channel, voice, noteNumber, velocity, startTime) {
         const now = this.audioContext.currentTime;
         const state = channel.state;
-        const controllerState = this.getControllerState(channel, noteNumber, velocity);
+        const controllerState = this.getControllerState(channel, noteNumber, velocity, 0);
         const voiceParams = voice.getAllParams(controllerState);
         const note = new Note(noteNumber, velocity, startTime, voice, voiceParams);
-        const audioBuffer = await this.getAudioBuffer(channel.programNumber, noteNumber, velocity, voiceParams, isSF3);
+        const audioBuffer = await this.getAudioBuffer(channel, noteNumber, velocity, voiceParams);
         note.bufferSource = this.createBufferSource(channel, noteNumber, voiceParams, audioBuffer);
-        note.volumeNode = new GainNode(this.audioContext);
-        note.gainL = new GainNode(this.audioContext);
-        note.gainR = new GainNode(this.audioContext);
         note.volumeEnvelopeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
             type: "lowpass",
@@ -1361,9 +1367,6 @@ export class Midy {
         }
         note.bufferSource.connect(note.filterNode);
         note.filterNode.connect(note.volumeEnvelopeNode);
-        note.volumeEnvelopeNode.connect(note.volumeNode);
-        note.volumeNode.connect(note.gainL);
-        note.volumeNode.connect(note.gainR);
         if (0 < state.chorusSendLevel) {
             this.setChorusEffectsSend(channel, note, 0, now);
         }
@@ -1422,21 +1425,30 @@ export class Midy {
         }
         this.drumExclusiveClassNotes[index] = note;
     }
-    async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime, noteOffEvent) {
+    async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime) {
         const channel = this.channels[channelNumber];
         const bankNumber = this.calcBank(channel, channelNumber);
-        const soundFontIndex = this.soundFontTable[channel.programNumber].get(bankNumber);
+        const soundFontIndex = this.soundFontTable[channel.programNumber]
+            .get(bankNumber);
         if (soundFontIndex === undefined)
             return;
         const soundFont = this.soundFonts[soundFontIndex];
         const voice = soundFont.getVoice(bankNumber, channel.programNumber, noteNumber, velocity);
         if (!voice)
             return;
-        const isSF3 = soundFont.parsed.info.version.major === 3;
-        const note = await this.createNote(channel, voice, noteNumber, velocity, startTime, isSF3);
-        note.noteOffEvent = noteOffEvent;
-        note.gainL.connect(channel.gainL);
-        note.gainR.connect(channel.gainR);
+        const note = await this.createNote(channel, voice, noteNumber, velocity, startTime);
+        if (channel.isDrum) {
+            const audioContext = this.audioContext;
+            const { gainL, gainR } = this.createChannelAudioNodes(audioContext);
+            channel.keyBasedGainLs[noteNumber] = gainL;
+            channel.keyBasedGainRs[noteNumber] = gainR;
+            note.volumeEnvelopeNode.connect(gainL);
+            note.volumeEnvelopeNode.connect(gainR);
+        }
+        else {
+            note.volumeEnvelopeNode.connect(channel.gainL);
+            note.volumeEnvelopeNode.connect(channel.gainR);
+        }
         if (0.5 <= channel.state.sustainPedal) {
             channel.sustainNotes.push(note);
         }
@@ -1454,9 +1466,6 @@ export class Midy {
         note.bufferSource.disconnect();
         note.filterNode.disconnect();
         note.volumeEnvelopeNode.disconnect();
-        note.volumeNode.disconnect();
-        note.gainL.disconnect();
-        note.gainR.disconnect();
         if (note.modulationDepth) {
             note.volumeDepth.disconnect();
             note.modulationDepth.disconnect();
@@ -1510,15 +1519,29 @@ export class Midy {
                     return;
             }
         }
-        const note = this.findNoteOffTarget(channel, noteNumber);
-        if (!note)
+        const index = this.findNoteOffIndex(channel, noteNumber);
+        if (index < 0)
             return;
+        const note = channel.scheduledNotes[index];
         note.ending = true;
+        this.setNoteIndex(channel, index);
         this.releaseNote(channel, note, endTime);
     }
-    findNoteOffTarget(channel, noteNumber) {
+    setNoteIndex(channel, index) {
+        let allEnds = true;
+        for (let i = channel.scheduleIndex; i < index; i++) {
+            const note = channel.scheduledNotes[i];
+            if (note && !note.ending) {
+                allEnds = false;
+                break;
+            }
+        }
+        if (allEnds)
+            channel.scheduleIndex = index + 1;
+    }
+    findNoteOffIndex(channel, noteNumber) {
         const scheduledNotes = channel.scheduledNotes;
-        for (let i = 0; i < scheduledNotes.length; i++) {
+        for (let i = channel.scheduleIndex; i < scheduledNotes.length; i++) {
             const note = scheduledNotes[i];
             if (!note)
                 continue;
@@ -1526,8 +1549,9 @@ export class Midy {
                 continue;
             if (note.noteNumber !== noteNumber)
                 continue;
-            return note;
+            return i;
         }
+        return -1;
     }
     noteOff(channelNumber, noteNumber, velocity, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
@@ -1567,31 +1591,31 @@ export class Midy {
             case 0x90:
                 return this.noteOn(channelNumber, data1, data2, scheduleTime);
             case 0xA0:
-                return this.handlePolyphonicKeyPressure(channelNumber, data1, data2, scheduleTime);
+                return this.setPolyphonicKeyPressure(channelNumber, data1, data2, scheduleTime);
             case 0xB0:
-                return this.handleControlChange(channelNumber, data1, data2, scheduleTime);
+                return this.setControlChange(channelNumber, data1, data2, scheduleTime);
             case 0xC0:
-                return this.handleProgramChange(channelNumber, data1, scheduleTime);
+                return this.setProgramChange(channelNumber, data1, scheduleTime);
             case 0xD0:
-                return this.handleChannelPressure(channelNumber, data1, scheduleTime);
+                return this.setChannelPressure(channelNumber, data1, scheduleTime);
             case 0xE0:
                 return this.handlePitchBendMessage(channelNumber, data1, data2, scheduleTime);
             default:
                 console.warn(`Unsupported MIDI message: ${messageType.toString(16)}`);
         }
     }
-    handlePolyphonicKeyPressure(channelNumber, noteNumber, pressure, scheduleTime) {
+    setPolyphonicKeyPressure(channelNumber, noteNumber, pressure, scheduleTime) {
         const channel = this.channels[channelNumber];
-        channel.state.polyphonicKeyPressure = pressure / 127;
         const table = channel.polyphonicKeyPressureTable;
         this.processActiveNotes(channel, scheduleTime, (note) => {
             if (note.noteNumber === noteNumber) {
-                this.setControllerParameters(channel, note, table);
+                note.pressure = pressure;
+                this.setControllerParameters(channel, note, table, scheduleTime);
             }
         });
         this.applyVoiceParams(channel, 10);
     }
-    handleProgramChange(channelNumber, programNumber, _scheduleTime) {
+    setProgramChange(channelNumber, programNumber, _scheduleTime) {
         const channel = this.channels[channelNumber];
         channel.bank = channel.bankMSB * 128 + channel.bankLSB;
         channel.programNumber = programNumber;
@@ -1606,20 +1630,21 @@ export class Midy {
             }
         }
     }
-    handleChannelPressure(channelNumber, value, scheduleTime) {
+    setChannelPressure(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
         const prev = channel.state.channelPressure;
         const next = value / 127;
         channel.state.channelPressure = next;
-        if (channel.channelPressureTable[0] !== 64) {
-            const pressureDepth = (channel.channelPressureTable[0] - 64) / 37.5; // 2400 / 64;
-            channel.detune += pressureDepth * (next - prev);
+        const channelPressureRaw = channel.channelPressureTable[0];
+        if (0 <= channelPressureRaw) {
+            const channelPressureDepth = (channelPressureRaw - 64) / 37.5; // 2400 / 64;
+            channel.detune += channelPressureDepth * (next - prev);
         }
         const table = channel.channelPressureTable;
         this.processActiveNotes(channel, scheduleTime, (note) => {
-            this.setControllerParameters(channel, note, table);
+            this.setControllerParameters(channel, note, table, scheduleTime);
         });
         this.applyVoiceParams(channel, 13);
     }
@@ -1675,10 +1700,12 @@ export class Midy {
             .setValueAtTime(volumeDepth, scheduleTime);
     }
     setReverbEffectsSend(channel, note, prevValue, scheduleTime) {
-        const keyBasedValue = this.getKeyBasedInstrumentControlValue(channel, note.noteNumber, 91);
         let value = note.voiceParams.reverbEffectsSend;
-        if (0 <= keyBasedValue) {
-            value *= keyBasedValue / 127 / channel.state.reverbSendLevel;
+        if (channel.isDrum) {
+            const keyBasedValue = this.getKeyBasedValue(channel, note.noteNumber, 91);
+            if (0 <= keyBasedValue) {
+                value *= keyBasedValue / 127 / channel.state.reverbSendLevel;
+            }
         }
         if (0 < prevValue) {
             if (0 < value) {
@@ -1696,20 +1723,22 @@ export class Midy {
                     note.reverbEffectsSend = new GainNode(this.audioContext, {
                         gain: value,
                     });
-                    note.volumeNode.connect(note.reverbEffectsSend);
+                    note.volumeEnvelopeNode.connect(note.reverbEffectsSend);
                 }
                 note.reverbEffectsSend.connect(this.reverbEffect.input);
             }
         }
     }
     setChorusEffectsSend(channel, note, prevValue, scheduleTime) {
-        const keyBasedValue = this.getKeyBasedInstrumentControlValue(channel, note.noteNumber, 93);
         let value = note.voiceParams.chorusEffectsSend;
-        if (0 <= keyBasedValue) {
-            value *= keyBasedValue / 127 / channel.state.chorusSendLevel;
+        if (channel.isDrum) {
+            const keyBasedValue = this.getKeyBasedValue(channel, note.noteNumber, 93);
+            if (0 <= keyBasedValue) {
+                value *= keyBasedValue / 127 / channel.state.chorusSendLevel;
+            }
         }
         if (0 < prevValue) {
-            if (0 < vaule) {
+            if (0 < value) {
                 note.chorusEffectsSend.gain
                     .cancelScheduledValues(scheduleTime)
                     .setValueAtTime(value, scheduleTime);
@@ -1724,7 +1753,7 @@ export class Midy {
                     note.chorusEffectsSend = new GainNode(this.audioContext, {
                         gain: value,
                     });
-                    note.volumeNode.connect(note.chorusEffectsSend);
+                    note.volumeEnvelopeNode.connect(note.chorusEffectsSend);
                 }
                 note.chorusEffectsSend.connect(this.chorusEffect.input);
             }
@@ -1799,21 +1828,22 @@ export class Midy {
             },
         };
     }
-    getControllerState(channel, noteNumber, velocity) {
+    getControllerState(channel, noteNumber, velocity, polyphonicKeyPressure) {
         const state = new Float32Array(channel.state.array.length);
         state.set(channel.state.array);
         state[2] = velocity / 127;
         state[3] = noteNumber / 127;
-        state[10] = state.polyphonicKeyPressure / 127;
+        state[10] = polyphonicKeyPressure / 127;
         state[13] = state.channelPressure / 127;
         return state;
     }
     applyVoiceParams(channel, controllerType, scheduleTime) {
         this.processScheduledNotes(channel, (note) => {
-            const controllerState = this.getControllerState(channel, note.noteNumber, note.velocity);
+            const controllerState = this.getControllerState(channel, note.noteNumber, note.velocity, note.pressure);
             const voiceParams = note.voice.getParams(controllerType, controllerState);
-            let appliedFilterEnvelope = false;
-            let appliedVolumeEnvelope = false;
+            let applyVolumeEnvelope = false;
+            let applyFilterEnvelope = false;
+            let applyPitchEnvelope = false;
             for (const [key, value] of Object.entries(voiceParams)) {
                 const prevValue = note.voiceParams[key];
                 if (value === prevValue)
@@ -1822,37 +1852,23 @@ export class Midy {
                 if (key in this.voiceParamsHandlers) {
                     this.voiceParamsHandlers[key](channel, note, prevValue, scheduleTime);
                 }
-                else if (filterEnvelopeKeySet.has(key)) {
-                    if (appliedFilterEnvelope)
-                        continue;
-                    appliedFilterEnvelope = true;
-                    const noteVoiceParams = note.voiceParams;
-                    for (let i = 0; i < filterEnvelopeKeys.length; i++) {
-                        const key = filterEnvelopeKeys[i];
-                        if (key in voiceParams)
-                            noteVoiceParams[key] = voiceParams[key];
-                    }
-                    if (0.5 <= channel.state.portamento && 0 <= note.portamentoNoteNumber) {
-                        this.setPortamentoFilterEnvelope(channel, note, scheduleTime);
-                    }
-                    else {
-                        this.setFilterEnvelope(channel, note, scheduleTime);
-                    }
-                    this.setPitchEnvelope(note, scheduleTime);
-                }
-                else if (volumeEnvelopeKeySet.has(key)) {
-                    if (appliedVolumeEnvelope)
-                        continue;
-                    appliedVolumeEnvelope = true;
-                    const noteVoiceParams = note.voiceParams;
-                    for (let i = 0; i < volumeEnvelopeKeys.length; i++) {
-                        const key = volumeEnvelopeKeys[i];
-                        if (key in voiceParams)
-                            noteVoiceParams[key] = voiceParams[key];
-                    }
-                    this.setVolumeEnvelope(channel, note, scheduleTime);
+                else {
+                    if (volumeEnvelopeKeySet.has(key))
+                        applyVolumeEnvelope = true;
+                    if (filterEnvelopeKeySet.has(key))
+                        applyFilterEnvelope = true;
+                    if (pitchEnvelopeKeySet.has(key))
+                        applyPitchEnvelope = true;
                 }
             }
+            if (applyVolumeEnvelope) {
+                this.setVolumeEnvelope(channel, note, scheduleTime);
+            }
+            if (applyFilterEnvelope) {
+                this.setFilterEnvelope(channel, note, scheduleTime);
+            }
+            if (applyPitchEnvelope)
+                this.setPitchEnvelope(note, scheduleTime);
         });
     }
     createControlChangeHandlers() {
@@ -1893,13 +1909,13 @@ export class Midy {
         handlers[127] = this.polyOn;
         return handlers;
     }
-    handleControlChange(channelNumber, controllerType, value, scheduleTime) {
+    setControlChange(channelNumber, controllerType, value, scheduleTime) {
         const handler = this.controlChangeHandlers[controllerType];
         if (handler) {
             handler.call(this, channelNumber, value, scheduleTime);
             const channel = this.channels[channelNumber];
             this.applyVoiceParams(channel, controllerType + 128, scheduleTime);
-            this.applyControlTable(channel, controllerType);
+            this.applyControlTable(channel, controllerType, scheduleTime);
         }
         else {
             console.warn(`Unsupported Control change: controllerType=${controllerType} value=${value}`);
@@ -1956,22 +1972,12 @@ export class Midy {
             return;
         this.updatePortamento(channel, scheduleTime);
     }
-    setKeyBasedVolume(channel, scheduleTime) {
-        this.processScheduledNotes(channel, (note) => {
-            const keyBasedValue = this.getKeyBasedInstrumentControlValue(channel, note.noteNumber, 7);
-            if (0 <= keyBasedValue) {
-                note.volumeNode.gain
-                    .cancelScheduledValues(scheduleTime)
-                    .setValueAtTime(keyBasedValue / 127, scheduleTime);
-            }
-        });
-    }
     setVolume(channelNumber, volume, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.state.volume = volume / 127;
         this.updateChannelVolume(channel, scheduleTime);
-        this.setKeyBasedVolume(channel, scheduleTime);
+        this.updateKeyBasedVolume(channel, scheduleTime);
     }
     panToGain(pan) {
         const theta = Math.PI / 2 * Math.max(0, pan * 127 - 1) / 126;
@@ -1980,26 +1986,12 @@ export class Midy {
             gainRight: Math.sin(theta),
         };
     }
-    setKeyBasedPan(channel, scheduleTime) {
-        this.processScheduledNotes(channel, (note) => {
-            const keyBasedValue = this.getKeyBasedInstrumentControlValue(channel, note.noteNumber, 10);
-            if (0 <= keyBasedValue) {
-                const { gainLeft, gainRight } = this.panToGain(keyBasedValue / 127);
-                note.gainL.gain
-                    .cancelScheduledValues(scheduleTime)
-                    .setValueAtTime(gainLeft, scheduleTime);
-                note.gainR.gain
-                    .cancelScheduledValues(scheduleTime)
-                    .setValueAtTime(gainRight, scheduleTime);
-            }
-        });
-    }
     setPan(channelNumber, pan, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.state.pan = pan / 127;
         this.updateChannelVolume(channel, scheduleTime);
-        this.setKeyBasedPan(channel, scheduleTime);
+        this.updateKeyBasedVolume(channel, scheduleTime);
     }
     setExpression(channelNumber, expression, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
@@ -2025,6 +2017,34 @@ export class Midy {
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(volume * gainRight, scheduleTime);
     }
+    updateKeyBasedVolume(channel, scheduleTime) {
+        if (!channel.isDrum)
+            return;
+        const state = channel.state;
+        const defaultVolume = state.volume * state.expression;
+        const defaultPan = state.pan;
+        for (let i = 0; i < 128; i++) {
+            const gainL = channel.keyBasedGainLs[i];
+            const gainR = channel.keyBasedGainLs[i];
+            if (!gainL)
+                continue;
+            if (!gainR)
+                continue;
+            const keyBasedVolume = this.getKeyBasedValue(channel, i, 7);
+            const volume = (0 <= keyBasedVolume)
+                ? defaultVolume * keyBasedVolume / 64
+                : defaultVolume;
+            const keyBasedPan = this.getKeyBasedValue(channel, i, 10);
+            const pan = (0 <= keyBasedPan) ? keyBasedPan / 127 : defaultPan;
+            const { gainLeft, gainRight } = this.panToGain(pan);
+            gainL.gain
+                .cancelScheduledValues(scheduleTime)
+                .setValueAtTime(volume * gainLeft, scheduleTime);
+            gainR.gain
+                .cancelScheduledValues(scheduleTime)
+                .setValueAtTime(volume * gainRight, scheduleTime);
+        }
+    }
     setSustainPedal(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
@@ -2114,7 +2134,7 @@ export class Midy {
         this.processScheduledNotes(channel, (note) => {
             if (note.startTime < scheduleTime)
                 return false;
-            this.setVolumeEnvelope(channel, note);
+            this.setVolumeEnvelope(channel, note, scheduleTime);
         });
     }
     setBrightness(channelNumber, brightness, scheduleTime) {
@@ -2129,7 +2149,7 @@ export class Midy {
                 this.setPortamentoFilterEnvelope(channel, note, scheduleTime);
             }
             else {
-                this.setFilterEnvelope(channel, note);
+                this.setFilterEnvelope(channel, note, scheduleTime);
             }
         });
     }
@@ -2399,7 +2419,7 @@ export class Midy {
         const entries = Object.entries(defaultControllerState);
         for (const [key, { type, defaultValue }] of entries) {
             if (128 <= type) {
-                this.handleControlChange(channelNumber, type - 128, Math.ceil(defaultValue * 127), scheduleTime);
+                this.setControlChange(channelNumber, type - 128, Math.ceil(defaultValue * 127), scheduleTime);
             }
             else {
                 state[key] = defaultValue;
@@ -2432,7 +2452,7 @@ export class Midy {
             const key = keys[i];
             const { type, defaultValue } = defaultControllerState[key];
             if (128 <= type) {
-                this.handleControlChange(channelNumber, type - 128, Math.ceil(defaultValue * 127), scheduleTime);
+                this.setControlChange(channelNumber, type - 128, Math.ceil(defaultValue * 127), scheduleTime);
             }
             else {
                 state[key] = defaultValue;
@@ -2656,8 +2676,7 @@ export class Midy {
     setReverbType(type) {
         this.reverb.time = this.getReverbTimeFromType(type);
         this.reverb.feedback = (type === 8) ? 0.9 : 0.8;
-        const { audioContext, options } = this;
-        this.reverbEffect = options.reverbAlgorithm(audioContext);
+        this.reverbEffect = this.createReverbEffect(this.audioContext);
     }
     getReverbTimeFromType(type) {
         switch (type) {
@@ -2679,8 +2698,7 @@ export class Midy {
     }
     setReverbTime(value) {
         this.reverb.time = this.getReverbTime(value);
-        const { audioContext, options } = this;
-        this.reverbEffect = options.reverbAlgorithm(audioContext);
+        this.reverbEffect = this.createReverbEffect(this.audioContext);
     }
     getReverbTime(value) {
         return Math.exp((value - 40) * 0.025);
@@ -2875,66 +2893,91 @@ export class Midy {
         }
     }
     getPitchControl(channel, note) {
-        const polyphonicKeyPressure = (channel.polyphonicKeyPressureTable[0] - 64) *
+        const polyphonicKeyPressureRaw = channel.polyphonicKeyPressureTable[0];
+        if (polyphonicKeyPressureRaw < 0)
+            return 0;
+        const polyphonicKeyPressure = (polyphonicKeyPressureRaw - 64) *
             note.pressure;
         return polyphonicKeyPressure * note.pressure / 37.5; // 2400 / 64;
     }
     getFilterCutoffControl(channel, note) {
-        const channelPressure = (channel.channelPressureTable[1] - 64) *
-            channel.state.channelPressure;
-        const polyphonicKeyPressure = (channel.polyphonicKeyPressureTable[1] - 64) *
-            note.pressure;
+        const channelPressureRaw = channel.channelPressureTable[1];
+        const channelPressure = (0 <= channelPressureRaw)
+            ? (channelPressureRaw - 64) * channel.state.channelPressure
+            : 0;
+        const polyphonicKeyPressureRaw = channel.polyphonicKeyPressureTable[1];
+        const polyphonicKeyPressure = (0 <= polyphonicKeyPressureRaw)
+            ? (polyphonicKeyPressureRaw - 64) * note.pressure
+            : 0;
         return (channelPressure + polyphonicKeyPressure) * 15;
     }
     getAmplitudeControl(channel, note) {
-        const channelPressure = channel.channelPressureTable[2] *
-            channel.state.channelPressure;
-        const polyphonicKeyPressure = channel.polyphonicKeyPressureTable[2] *
-            note.pressure;
+        const channelPressureRaw = channel.channelPressureTable[2];
+        const channelPressure = (0 <= channelPressureRaw)
+            ? channelPressureRaw * channel.state.channelPressure
+            : 0;
+        const polyphonicKeyPressureRaw = channel.polyphonicKeyPressureTable[2];
+        const polyphonicKeyPressure = (0 <= polyphonicKeyPressureRaw)
+            ? polyphonicKeyPressureRaw * note.pressure
+            : 0;
         return (channelPressure + polyphonicKeyPressure) / 128;
     }
     getLFOPitchDepth(channel, note) {
-        const channelPressure = channel.channelPressureTable[3] *
-            channel.state.channelPressure;
-        const polyphonicKeyPressure = channel.polyphonicKeyPressureTable[3] *
-            note.pressure;
+        const channelPressureRaw = channel.channelPressureTable[3];
+        const channelPressure = (0 <= channelPressureRaw)
+            ? channelPressureRaw * channel.state.channelPressure
+            : 0;
+        const polyphonicKeyPressureRaw = channel.polyphonicKeyPressureTable[3];
+        const polyphonicKeyPressure = (0 <= polyphonicKeyPressureRaw)
+            ? polyphonicKeyPressureRaw * note.pressure
+            : 0;
         return (channelPressure + polyphonicKeyPressure) / 254 * 600;
     }
     getLFOFilterDepth(channel, note) {
-        const channelPressure = channel.channelPressureTable[4] *
-            channel.state.channelPressure;
-        const polyphonicKeyPressure = channel.polyphonicKeyPressureTable[4] *
-            note.pressure;
+        const channelPressureRaw = channel.channelPressureTable[4];
+        const channelPressure = (0 <= channelPressureRaw)
+            ? channelPressureRaw * channel.state.channelPressure
+            : 0;
+        const polyphonicKeyPressureRaw = channel.polyphonicKeyPressureTable[4];
+        const polyphonicKeyPressure = (0 <= polyphonicKeyPressureRaw)
+            ? polyphonicKeyPressureRaw * note.pressure
+            : 0;
         return (channelPressure + polyphonicKeyPressure) / 254 * 2400;
     }
     getLFOAmplitudeDepth(channel, note) {
-        const channelPressure = channel.channelPressureTable[5] *
-            channel.state.channelPressure;
-        const polyphonicKeyPressure = channel.polyphonicKeyPressureTable[5] *
-            note.pressure;
+        const channelPressureRaw = channel.channelPressureTable[5];
+        const channelPressure = (0 <= channelPressureRaw)
+            ? channelPressureRaw * channel.state.channelPressure
+            : 0;
+        const polyphonicKeyPressureRaw = channel.polyphonicKeyPressureTable[5];
+        const polyphonicKeyPressure = (0 <= polyphonicKeyPressureRaw)
+            ? polyphonicKeyPressureRaw * note.pressure
+            : 0;
         return (channelPressure + polyphonicKeyPressure) / 254;
     }
-    setControllerParameters(channel, note, table) {
-        if (table[0] !== 64)
-            this.updateDetune(channel, note);
+    setControllerParameters(channel, note, table, scheduleTime) {
+        if (0 <= table[0])
+            this.updateDetune(channel, note, scueduleTime);
         if (0.5 <= channel.state.portamemento && 0 <= note.portamentoNoteNumber) {
-            if (table[1] !== 64)
-                this.setPortamentoFilterEnvelope(channel, note);
-            if (table[2] !== 64)
-                this.setPortamentoVolumeEnvelope(channel, note);
+            if (0 <= table[1]) {
+                this.setPortamentoFilterEnvelope(channel, note, scheduleTime);
+            }
+            if (0 <= table[2]) {
+                this.setPortamentoVolumeEnvelope(channel, note, scheduleTime);
+            }
         }
         else {
-            if (table[1] !== 64)
-                this.setFilterEnvelope(channel, note);
-            if (table[2] !== 64)
-                this.setVolumeEnvelope(channel, note);
-        }
-        if (table[3] !== 0)
-            this.setModLfoToPitch(channel, note);
-        if (table[4] !== 0)
-            this.setModLfoToFilterFc(channel, note);
-        if (table[5] !== 0)
-            this.setModLfoToVolume(channel, note);
+            if (0 <= table[1])
+                this.setFilterEnvelope(channel, note, scheduleTime);
+            if (0 <= table[2])
+                this.setVolumeEnvelope(channel, note, scheduleTime);
+        }
+        if (0 <= table[3])
+            this.setModLfoToPitch(channel, note, scheduleTime);
+        if (0 <= table[4])
+            this.setModLfoToFilterFc(channel, note, scheduleTime);
+        if (0 <= table[5])
+            this.setModLfoToVolume(channel, note, scheduleTime);
     }
     handlePressureSysEx(data, tableName) {
         const channelNumber = data[4];
@@ -2949,27 +2992,16 @@ export class Midy {
         }
     }
     initControlTable() {
-        const channelCount = 128;
+        const ccCount = 128;
         const slotSize = 6;
-        const table = new Uint8Array(channelCount * slotSize);
-        return this.resetControlTable(table);
+        return new Int8Array(ccCount * slotSize).fill(-1);
     }
-    resetControlTable(table) {
-        const channelCount = 128;
-        const slotSize = 6;
-        const defaultValues = [64, 64, 64, 0, 0, 0];
-        for (let ch = 0; ch < channelCount; ch++) {
-            const offset = ch * slotSize;
-            table.set(defaultValues, offset);
-        }
-        return table;
-    }
-    applyControlTable(channel, controllerType) {
+    applyControlTable(channel, controllerType, scheduleTime) {
         const slotSize = 6;
         const offset = controllerType * slotSize;
         const table = channel.controlTable.subarray(offset, offset + slotSize);
         this.processScheduledNotes(channel, (note) => {
-            this.setControllerParameters(channel, note, table);
+            this.setControllerParameters(channel, note, table, scheduleTime);
         });
     }
     handleControlChangeSysEx(data) {
@@ -2985,7 +3017,7 @@ export class Midy {
             table[pp] = rr;
         }
     }
-    getKeyBasedInstrumentControlValue(channel, keyNumber, controllerType) {
+    getKeyBasedValue(channel, keyNumber, controllerType) {
         const index = keyNumber * 128 + controllerType;
         const controlValue = channel.keyBasedInstrumentControlTable[index];
         return controlValue;
@@ -2993,7 +3025,7 @@ export class Midy {
     handleKeyBasedInstrumentControlSysEx(data, scheduleTime) {
         const channelNumber = data[4];
         const channel = this.channels[channelNumber];
-        if (channel.isDrum)
+        if (!channel.isDrum)
             return;
         const keyNumber = data[5];
         const table = channel.keyBasedInstrumentControlTable;
@@ -3003,7 +3035,7 @@ export class Midy {
             const index = keyNumber * 128 + controllerType;
             table[index] = value;
         }
-        this.handleChannelPressure(channelNumber, channel.state.channelPressure * 127, scheduleTime);
+        this.setChannelPressure(channelNumber, channel.state.channelPressure * 127, scheduleTime);
     }
     handleSysEx(data, scheduleTime) {
         switch (data[0]) {
@@ -3040,6 +3072,7 @@ Object.defineProperty(Midy, "channelSettings", {
     configurable: true,
     writable: true,
     value: {
+        scheduleIndex: 0,
         detune: 0,
         programNumber: 0,
         bank: 121 * 128,