@marmooo/midy 0.3.4 → 0.3.5

package/esm/midy-GM2.js

@@ -314,13 +314,13 @@ export class MidyGM2 {
             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,
@@ -417,13 +417,11 @@ export class MidyGM2 {
         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);
@@ -436,23 +434,32 @@ export class MidyGM2 {
         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);
@@ -460,6 +467,45 @@ export class MidyGM2 {
         this.timeline = midiData.timeline;
         this.totalTime = this.calcTotalTime();
     }
+    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 });
@@ -501,34 +547,12 @@ export class MidyGM2 {
         });
         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;
@@ -565,13 +589,13 @@ export class MidyGM2 {
                     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);
@@ -605,8 +629,9 @@ export class MidyGM2 {
                     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();
@@ -628,8 +653,9 @@ export class MidyGM2 {
                     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;
@@ -662,11 +688,7 @@ export class MidyGM2 {
     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);
@@ -687,8 +709,6 @@ export class MidyGM2 {
                 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) {
@@ -738,10 +758,6 @@ export class MidyGM2 {
                 timeline.push(event);
             }
         }
-        for (const [audioBufferId, count] of this.audioBufferCounter) {
-            if (count === 1)
-                this.audioBufferCounter.delete(audioBufferId);
-        }
         const priority = {
             controller: 0,
             sysEx: 1,
@@ -781,12 +797,11 @@ export class MidyGM2 {
     stopChannelNotes(channelNumber, velocity, force, scheduleTime) {
         const channel = this.channels[channelNumber];
         const promises = [];
-        this.processScheduledNotes(channel, scheduleTime, (note) => {
+        this.processScheduledNotes(channel, (note) => {
             const promise = this.scheduleNoteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force);
             this.notePromises.push(promise);
             promises.push(promise);
         });
-        channel.scheduledNotes = [];
         return Promise.all(promises);
     }
     stopNotes(velocity, force, scheduleTime) {
@@ -800,6 +815,8 @@ export class MidyGM2 {
         if (this.isPlaying || this.isPaused)
             return;
         this.resumeTime = 0;
+        if (this.voiceCounter.size === 0)
+            this.cacheVoiceIds();
         await this.playNotes();
         this.isPlaying = false;
     }
@@ -840,22 +857,20 @@ export class MidyGM2 {
         const now = this.audioContext.currentTime;
         return this.resumeTime + now - this.startTime - this.startDelay;
     }
-    processScheduledNotes(channel, scheduleTime, callback) {
+    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;
             if (note.ending)
                 continue;
-            if (note.startTime < scheduleTime)
-                continue;
             callback(note);
         }
     }
     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;
@@ -1046,7 +1061,7 @@ export class MidyGM2 {
         return channel.scaleOctaveTuningTable[note.noteNumber % 12];
     }
     updateChannelDetune(channel, scheduleTime) {
-        this.processScheduledNotes(channel, scheduleTime, (note) => {
+        this.processScheduledNotes(channel, (note) => {
             this.updateDetune(channel, note, scheduleTime);
         });
     }
@@ -1267,31 +1282,31 @@ export class MidyGM2 {
         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 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.volumeEnvelopeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
@@ -1386,15 +1401,15 @@ export class MidyGM2 {
     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);
+        const note = await this.createNote(channel, voice, noteNumber, velocity, startTime);
         if (channel.isDrum) {
             const audioContext = this.audioContext;
             const { gainL, gainR } = this.createChannelAudioNodes(audioContext);
@@ -1476,15 +1491,29 @@ export class MidyGM2 {
                     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;
@@ -1492,8 +1521,9 @@ export class MidyGM2 {
                 continue;
             if (note.noteNumber !== noteNumber)
                 continue;
-            return note;
+            return i;
         }
+        return -1;
     }
     noteOff(channelNumber, noteNumber, velocity, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
@@ -1533,18 +1563,18 @@ export class MidyGM2 {
             case 0x90:
                 return this.noteOn(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)}`);
         }
     }
-    handleProgramChange(channelNumber, programNumber, _scheduleTime) {
+    setProgramChange(channelNumber, programNumber, _scheduleTime) {
         const channel = this.channels[channelNumber];
         channel.bank = channel.bankMSB * 128 + channel.bankLSB;
         channel.programNumber = programNumber;
@@ -1559,7 +1589,7 @@ export class MidyGM2 {
             }
         }
     }
-    handleChannelPressure(channelNumber, value, scheduleTime) {
+    setChannelPressure(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
@@ -1631,7 +1661,7 @@ export class MidyGM2 {
     setReverbEffectsSend(channel, note, prevValue, scheduleTime) {
         let value = note.voiceParams.reverbEffectsSend;
         if (channel.isDrum) {
-            const keyBasedValue = this.getKeyBasedInstrumentControlValue(channel, note.noteNumber, 91);
+            const keyBasedValue = this.getKeyBasedValue(channel, note.noteNumber, 91);
             if (0 <= keyBasedValue) {
                 value *= keyBasedValue / 127 / channel.state.reverbSendLevel;
             }
@@ -1661,13 +1691,13 @@ export class MidyGM2 {
     setChorusEffectsSend(channel, note, prevValue, scheduleTime) {
         let value = note.voiceParams.chorusEffectsSend;
         if (channel.isDrum) {
-            const keyBasedValue = this.getKeyBasedInstrumentControlValue(channel, note.noteNumber, 93);
+            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);
@@ -1766,7 +1796,7 @@ export class MidyGM2 {
         return state;
     }
     applyVoiceParams(channel, controllerType, scheduleTime) {
-        this.processScheduledNotes(channel, scheduleTime, (note) => {
+        this.processScheduledNotes(channel, (note) => {
             const controllerState = this.getControllerState(channel, note.noteNumber, note.velocity);
             const voiceParams = note.voice.getParams(controllerType, controllerState);
             let applyVolumeEnvelope = false;
@@ -1827,7 +1857,7 @@ export class MidyGM2 {
         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);
@@ -1844,7 +1874,7 @@ export class MidyGM2 {
     }
     updateModulation(channel, scheduleTime) {
         const depth = channel.state.modulationDepth * channel.modulationDepthRange;
-        this.processScheduledNotes(channel, scheduleTime, (note) => {
+        this.processScheduledNotes(channel, (note) => {
             if (note.modulationDepth) {
                 note.modulationDepth.gain.setValueAtTime(depth, scheduleTime);
             }
@@ -1863,7 +1893,7 @@ export class MidyGM2 {
         this.updateModulation(channel, scheduleTime);
     }
     updatePortamento(channel, scheduleTime) {
-        this.processScheduledNotes(channel, scheduleTime, (note) => {
+        this.processScheduledNotes(channel, (note) => {
             if (0.5 <= channel.state.portamento) {
                 if (0 <= note.portamentoNoteNumber) {
                     this.setPortamentoVolumeEnvelope(channel, note, scheduleTime);
@@ -1948,11 +1978,11 @@ export class MidyGM2 {
                 continue;
             if (!gainR)
                 continue;
-            const keyBasedVolume = this.getKeyBasedInstrumentControlValue(channel, i, 7);
+            const keyBasedVolume = this.getKeyBasedValue(channel, i, 7);
             const volume = (0 <= keyBasedVolume)
                 ? defaultVolume * keyBasedVolume / 64
                 : defaultVolume;
-            const keyBasedPan = this.getKeyBasedInstrumentControlValue(channel, i, 10);
+            const keyBasedPan = this.getKeyBasedValue(channel, i, 10);
             const pan = (0 <= keyBasedPan) ? keyBasedPan / 127 : defaultPan;
             const { gainLeft, gainRight } = this.panToGain(pan);
             gainL.gain
@@ -1970,7 +2000,7 @@ export class MidyGM2 {
         scheduleTime ??= this.audioContext.currentTime;
         channel.state.sustainPedal = value / 127;
         if (64 <= value) {
-            this.processScheduledNotes(channel, scheduleTime, (note) => {
+            this.processScheduledNotes(channel, (note) => {
                 channel.sustainNotes.push(note);
             });
         }
@@ -2013,7 +2043,7 @@ export class MidyGM2 {
         const state = channel.state;
         scheduleTime ??= this.audioContext.currentTime;
         state.softPedal = softPedal / 127;
-        this.processScheduledNotes(channel, scheduleTime, (note) => {
+        this.processScheduledNotes(channel, (note) => {
             if (0.5 <= state.portamento && 0 <= note.portamentoNoteNumber) {
                 this.setPortamentoVolumeEnvelope(channel, note, scheduleTime);
                 this.setPortamentoFilterEnvelope(channel, note, scheduleTime);
@@ -2037,7 +2067,7 @@ export class MidyGM2 {
                     .setValueAtTime(state.reverbSendLevel, scheduleTime);
             }
             else {
-                this.processScheduledNotes(channel, scheduleTime, (note) => {
+                this.processScheduledNotes(channel, (note) => {
                     if (note.voiceParams.reverbEffectsSend <= 0)
                         return false;
                     if (note.reverbEffectsSend)
@@ -2047,7 +2077,7 @@ export class MidyGM2 {
         }
         else {
             if (0 < reverbSendLevel) {
-                this.processScheduledNotes(channel, scheduleTime, (note) => {
+                this.processScheduledNotes(channel, (note) => {
                     this.setReverbEffectsSend(channel, note, 0, scheduleTime);
                 });
                 state.reverbSendLevel = reverbSendLevel / 127;
@@ -2070,7 +2100,7 @@ export class MidyGM2 {
                     .setValueAtTime(state.chorusSendLevel, scheduleTime);
             }
             else {
-                this.processScheduledNotes(channel, scheduleTime, (note) => {
+                this.processScheduledNotes(channel, (note) => {
                     if (note.voiceParams.chorusEffectsSend <= 0)
                         return false;
                     if (note.chorusEffectsSend)
@@ -2080,7 +2110,7 @@ export class MidyGM2 {
         }
         else {
             if (0 < chorusSendLevel) {
-                this.processScheduledNotes(channel, scheduleTime, (note) => {
+                this.processScheduledNotes(channel, (note) => {
                     this.setChorusEffectsSend(channel, note, 0, scheduleTime);
                 });
                 state.chorusSendLevel = chorusSendLevel / 127;
@@ -2224,7 +2254,7 @@ export class MidyGM2 {
         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;
@@ -2256,7 +2286,7 @@ export class MidyGM2 {
             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;
@@ -2691,27 +2721,29 @@ export class MidyGM2 {
             : 0;
         return channelPressure / 127;
     }
-    setControllerParameters(channel, note, table) {
+    setControllerParameters(channel, note, table, scheduleTime) {
         if (0 <= table[0])
-            this.updateDetune(channel, note);
+            this.updateDetune(channel, note, scueduleTime);
         if (0.5 <= channel.state.portamemento && 0 <= note.portamentoNoteNumber) {
-            if (0 <= table[1])
-                this.setPortamentoFilterEnvelope(channel, note);
-            if (0 <= table[2])
-                this.setPortamentoVolumeEnvelope(channel, note);
+            if (0 <= table[1]) {
+                this.setPortamentoFilterEnvelope(channel, note, scheduleTime);
+            }
+            if (0 <= table[2]) {
+                this.setPortamentoVolumeEnvelope(channel, note, scheduleTime);
+            }
         }
         else {
             if (0 <= table[1])
-                this.setFilterEnvelope(channel, note);
+                this.setFilterEnvelope(channel, note, scheduleTime);
             if (0 <= table[2])
-                this.setVolumeEnvelope(channel, note);
+                this.setVolumeEnvelope(channel, note, scheduleTime);
         }
         if (0 <= table[3])
-            this.setModLfoToPitch(channel, note);
+            this.setModLfoToPitch(channel, note, scheduleTime);
         if (0 <= table[4])
-            this.setModLfoToFilterFc(channel, note);
+            this.setModLfoToFilterFc(channel, note, scheduleTime);
         if (0 <= table[5])
-            this.setModLfoToVolume(channel, note);
+            this.setModLfoToVolume(channel, note, scheduleTime);
     }
     handlePressureSysEx(data, tableName) {
         const channelNumber = data[4];
@@ -2734,8 +2766,8 @@ export class MidyGM2 {
         const slotSize = 6;
         const offset = controllerType * slotSize;
         const table = channel.controlTable.subarray(offset, offset + slotSize);
-        this.processScheduledNotes(channel, scheduleTime, (note) => {
-            this.setControllerParameters(channel, note, table);
+        this.processScheduledNotes(channel, (note) => {
+            this.setControllerParameters(channel, note, table, scheduleTime);
         });
     }
     handleControlChangeSysEx(data) {
@@ -2751,7 +2783,7 @@ export class MidyGM2 {
             table[pp] = rr;
         }
     }
-    getKeyBasedInstrumentControlValue(channel, keyNumber, controllerType) {
+    getKeyBasedValue(channel, keyNumber, controllerType) {
         const index = keyNumber * 128 + controllerType;
         const controlValue = channel.keyBasedInstrumentControlTable[index];
         return controlValue;
@@ -2769,7 +2801,7 @@ export class MidyGM2 {
             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]) {
@@ -2806,6 +2838,7 @@ Object.defineProperty(MidyGM2, "channelSettings", {
     configurable: true,
     writable: true,
     value: {
+        scheduleIndex: 0,
         detune: 0,
         programNumber: 0,
         bank: 121 * 128,