@marmooo/midy 0.3.4 → 0.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "A MIDI player/synthesizer written in JavaScript that supports GM-Lite/GM1 and SF2/SF3.",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "test": "node test_runner.js"
   },
   "dependencies": {
-    "@marmooo/soundfont-parser": "^0.1.1",
+    "@marmooo/soundfont-parser": "^0.1.3",
     "midi-file": "^1.2.4"
   },
   "devDependencies": {

package/script/midy-GM1.d.ts

@@ -23,16 +23,16 @@ export class MidyGM1 {
     resumeTime: number;
     soundFonts: any[];
     soundFontTable: any[];
-    audioBufferCounter: Map<any, any>;
-    audioBufferCache: Map<any, any>;
+    voiceCounter: Map<any, any>;
+    voiceCache: Map<any, any>;
     isPlaying: boolean;
     isPausing: boolean;
     isPaused: boolean;
     isStopping: boolean;
     isSeeking: boolean;
     timeline: any[];
-    instruments: any[];
     notePromises: any[];
+    instruments: Set<any>;
     exclusiveClassNotes: any[];
     audioContext: any;
     masterVolume: any;
@@ -54,22 +54,24 @@ export class MidyGM1 {
     channels: any[];
     initSoundFontTable(): any[];
     addSoundFont(soundFont: any): void;
+    toUint8Array(input: any): Promise<Uint8Array<ArrayBuffer>>;
     loadSoundFont(input: any): Promise<void>;
     loadMIDI(input: any): Promise<void>;
+    cacheVoiceIds(): void;
+    getVoiceId(channel: any, noteNumber: any, velocity: any): any;
     createChannelAudioNodes(audioContext: any): {
         gainL: any;
         gainR: any;
         merger: any;
     };
     createChannels(audioContext: any): any[];
-    createNoteBuffer(voiceParams: any, isSF3: any): Promise<any>;
+    createAudioBuffer(voiceParams: any): Promise<any>;
     createBufferSource(voiceParams: any, audioBuffer: any): any;
     scheduleTimelineEvents(t: any, resumeTime: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
     playNotes(): Promise<any>;
     ticksToSecond(ticks: any, secondsPerBeat: any): number;
     secondToTicks(second: any, secondsPerBeat: any): number;
-    getAudioBufferId(programNumber: any, noteNumber: any, velocity: any): string;
     extractMidiData(midi: any): {
         instruments: Set<any>;
         timeline: any[];
@@ -84,7 +86,7 @@ export class MidyGM1 {
     seekTo(second: any): void;
     calcTotalTime(): number;
     currentTime(): number;
-    processScheduledNotes(channel: any, scheduleTime: any, callback: any): void;
+    processScheduledNotes(channel: any, callback: any): void;
     processActiveNotes(channel: any, scheduleTime: any, callback: any): void;
     cbToRatio(cb: any): number;
     rateToCent(rate: any): number;
@@ -98,19 +100,20 @@ export class MidyGM1 {
     clampCutoffFrequency(frequency: any): number;
     setFilterEnvelope(note: any, scheduleTime: any): void;
     startModulation(channel: any, note: any, scheduleTime: any): void;
-    getAudioBuffer(programNumber: any, noteNumber: any, velocity: any, voiceParams: any, isSF3: any): Promise<any>;
-    createNote(channel: any, voice: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
+    getAudioBuffer(channel: any, noteNumber: any, velocity: any, voiceParams: any): Promise<any>;
+    createNote(channel: any, voice: any, noteNumber: any, velocity: any, startTime: any): Promise<Note>;
     handleExclusiveClass(note: any, channelNumber: any, startTime: any): void;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     noteOn(channelNumber: any, noteNumber: any, velocity: any, scheduleTime: any): Promise<void>;
     disconnectNote(note: any): void;
     releaseNote(channel: any, note: any, endTime: any): Promise<any>;
     scheduleNoteOff(channelNumber: any, noteNumber: any, _velocity: any, endTime: any, force: any): void;
-    findNoteOffTarget(channel: any, noteNumber: any): any;
+    setNoteIndex(channel: any, index: any): void;
+    findNoteOffIndex(channel: any, noteNumber: any): any;
     noteOff(channelNumber: any, noteNumber: any, velocity: any, scheduleTime: any): void;
     releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): void[];
     handleMIDIMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<void>;
-    handleProgramChange(channelNumber: any, programNumber: any, _scheduleTime: any): void;
+    setProgramChange(channelNumber: any, programNumber: any, _scheduleTime: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any, scheduleTime: any): void;
     setPitchBend(channelNumber: any, value: any, scheduleTime: any): void;
     setModLfoToPitch(channel: any, note: any, scheduleTime: any): void;
@@ -133,7 +136,7 @@ export class MidyGM1 {
     getControllerState(channel: any, noteNumber: any, velocity: any): Float32Array<any>;
     applyVoiceParams(channel: any, controllerType: any, scheduleTime: any): void;
     createControlChangeHandlers(): any[];
-    handleControlChange(channelNumber: any, controllerType: any, value: any, scheduleTime: any): void;
+    setControlChange(channelNumber: any, controllerType: any, value: any, scheduleTime: any): void;
     updateModulation(channel: any, scheduleTime: any): void;
     setModulationDepth(channelNumber: any, modulation: any, scheduleTime: any): void;
     setVolume(channelNumber: any, volume: any, scheduleTime: any): void;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AA4FA;IAwBE;;;;;;;;;;;MAWE;IAEF,+BAcC;IAlDD,aAAa;IACb,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,kCAA+B;IAC/B,gCAA6B;IAC7B,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAClB,2BAAqC;IAgBnC,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,gBAAiD;IAMnD,4BAMC;IAED,mCAWC;IAED,yCAcC;IAED,oCAiBC;IAED;;;;MAeC;IAED,yCAaC;IAED,6DA2BC;IAED,4DASC;IAED,+EAkDC;IAED,mCAOC;IAED,0BA8DC;IAED,uDAEC;IAED,wDAEC;IAED,6EAEC;IAED;;;MA6EC;IAED,kGAeC;IAED,mGAgBC;IAED,wEAMC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,4EASC;IAED,yEASC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,+GA0BC;IAED,gHAyCC;IAED,0EAiBC;IAED,kGAsCC;IAED,6FASC;IAED,gCASC;IAED,iEAoBC;IAED,qGAaC;IAED,sDASC;IAED,qFASC;IAED,sFAeC;IAED,oGA2BC;IAED,sFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAQC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MA2BC;IAED,oFAMC;IAED,6EAgCC;IAED,qCAcC;IAED,kGAWC;IAED,wDAUC;IAED,iFAKC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,2DAMC;IAED,uDAkBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAKC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,yCAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAGD,6DAgBC;CACF;AAv9CD;IAWE,0FAMC;IAhBD,cAAW;IACX,gBAAe;IACf,kBAAa;IACb,gBAAW;IACX,iBAAY;IACZ,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,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":"AA4FA;IAwBE;;;;;;;;;;;MAWE;IAEF,+BAcC;IAlDD,aAAa;IACb,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,4BAAyB;IACzB,0BAAuB;IACvB,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,oBAAkB;IAClB,sBAAwB;IACxB,2BAAqC;IAgBnC,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,gBAAiD;IAMnD,4BAMC;IAED,mCASC;IAED,2DAYC;IAED,yCAmBC;IAED,oCASC;IAED,sBAoCC;IAED,8DAcC;IAED;;;;MAeC;IAED,yCAaC;IAED,kDAUC;IAED,4DASC;IAED,+EAkDC;IAED,mCAOC;IAED,0BAgEC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,kGAeC;IAED,mGAeC;IAED,wEAMC;IAED,uBAMC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,yDAQC;IAED,yEASC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,6FAyBC;IAED,oGAuCC;IAED,0EAiBC;IAED,kGAmCC;IAED,6FASC;IAED,gCASC;IAED,iEAoBC;IAED,qGAeC;IAED,6CAUC;IAED,qDAUC;IAED,qFASC;IAED,sFAeC;IAED,oGA2BC;IAED,mFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAWC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MA2BC;IAED,oFAMC;IAED,6EAgCC;IAED,qCAeC;IAED,+FAWC;IAED,wDASC;IAED,iFAKC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,2DAMC;IAED,uDAkBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAKC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,yCAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAGD,6DAgBC;CACF;AAjgDD;IAWE,0FAMC;IAhBD,cAAW;IACX,gBAAe;IACf,kBAAa;IACb,gBAAW;IACX,iBAAY;IACZ,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}

package/script/midy-GM1.js

@@ -205,13 +205,13 @@ class MidyGM1 {
             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,
@@ -253,17 +253,17 @@ class MidyGM1 {
             writable: true,
             value: []
         });
-        Object.defineProperty(this, "instruments", {
+        Object.defineProperty(this, "notePromises", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: []
         });
-        Object.defineProperty(this, "notePromises", {
+        Object.defineProperty(this, "instruments", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: []
+            value: new Set()
         });
         Object.defineProperty(this, "exclusiveClassNotes", {
             enumerable: true,
@@ -298,13 +298,11 @@ class MidyGM1 {
         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);
@@ -317,23 +315,32 @@ class MidyGM1 {
         else {
             throw new TypeError("input must be a URL string or Uint8Array");
         }
-        const parsed = (0, soundfont_parser_1.parse)(uint8Array);
-        const soundFont = new soundfont_parser_1.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 = (0, soundfont_parser_1.parse)(uint8Arrays[i]);
+                const soundFont = new soundfont_parser_1.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 = (0, soundfont_parser_1.parse)(uint8Array);
+            const soundFont = new soundfont_parser_1.SoundFont(parsed);
+            this.addSoundFont(soundFont);
         }
+    }
+    async loadMIDI(input) {
+        this.voiceCounter.clear();
+        const uint8Array = await this.toUint8Array(input);
         const midi = (0, midi_file_1.parseMidi)(uint8Array);
         this.ticksPerBeat = midi.header.ticksPerBeat;
         const midiData = this.extractMidiData(midi);
@@ -341,6 +348,45 @@ class MidyGM1 {
         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.GM1SystemOn();
+    }
+    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 * (2 ** 32) + (instrument << 16) + sampleID;
+    }
     createChannelAudioNodes(audioContext) {
         const { gainLeft, gainRight } = this.panToGain(defaultControllerState.pan.defaultValue);
         const gainL = new GainNode(audioContext, { gain: gainLeft });
@@ -369,34 +415,12 @@ class MidyGM1 {
         });
         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;
     }
     createBufferSource(voiceParams, audioBuffer) {
         const bufferSource = new AudioBufferSourceNode(this.audioContext);
@@ -426,10 +450,10 @@ class MidyGM1 {
                     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 "pitchBend":
                     this.setPitchBend(event.channel, event.value + 8192, startTime);
@@ -462,8 +486,9 @@ class MidyGM1 {
                     await Promise.all(this.notePromises);
                     this.notePromises = [];
                     this.exclusiveClassNotes.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();
@@ -484,8 +509,9 @@ class MidyGM1 {
                     await this.stopNotes(0, true, now);
                     this.notePromises = [];
                     this.exclusiveClassNotes.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;
@@ -517,11 +543,7 @@ class MidyGM1 {
     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);
@@ -541,8 +563,6 @@ class MidyGM1 {
                 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) {
                             instruments.add(`${channel.bank}:0`);
                             channel.programNumber = 0;
@@ -559,10 +579,6 @@ class MidyGM1 {
                 timeline.push(event);
             }
         }
-        for (const [audioBufferId, count] of this.audioBufferCounter) {
-            if (count === 1)
-                this.audioBufferCounter.delete(audioBufferId);
-        }
         const priority = {
             controller: 0,
             sysEx: 1,
@@ -600,12 +616,11 @@ class MidyGM1 {
     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) {
@@ -619,6 +634,8 @@ class MidyGM1 {
         if (this.isPlaying || this.isPaused)
             return;
         this.resumeTime = 0;
+        if (this.voiceCounter.size === 0)
+            this.cacheVoiceIds();
         await this.playNotes();
         this.isPlaying = false;
     }
@@ -659,22 +676,20 @@ class MidyGM1 {
         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;
@@ -705,7 +720,7 @@ class MidyGM1 {
         return tuning + pitch;
     }
     updateChannelDetune(channel, scheduleTime) {
-        this.processScheduledNotes(channel, scheduleTime, (note) => {
+        this.processScheduledNotes(channel, (note) => {
             this.updateDetune(channel, note, scheduleTime);
         });
     }
@@ -798,31 +813,31 @@ class MidyGM1 {
         note.modulationLFO.connect(note.volumeDepth);
         note.volumeDepth.connect(note.volumeEnvelopeNode.gain);
     }
-    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(voiceParams, audioBuffer);
         note.volumeEnvelopeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
@@ -858,15 +873,15 @@ class MidyGM1 {
     async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime) {
         const channel = this.channels[channelNumber];
         const bankNumber = channel.bank;
-        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);
         note.volumeEnvelopeNode.connect(channel.gainL);
         note.volumeEnvelopeNode.connect(channel.gainR);
         if (0.5 <= channel.state.sustainPedal) {
@@ -916,15 +931,29 @@ class MidyGM1 {
         const channel = this.channels[channelNumber];
         if (!force && 0.5 <= channel.state.sustainPedal)
             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;
@@ -932,8 +961,9 @@ class MidyGM1 {
                 continue;
             if (note.noteNumber !== noteNumber)
                 continue;
-            return note;
+            return i;
         }
+        return -1;
     }
     noteOff(channelNumber, noteNumber, velocity, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
@@ -959,16 +989,16 @@ class MidyGM1 {
             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 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.programNumber = programNumber;
     }
@@ -988,13 +1018,17 @@ class MidyGM1 {
         this.applyVoiceParams(channel, 14, scheduleTime);
     }
     setModLfoToPitch(channel, note, scheduleTime) {
-        const modLfoToPitch = note.voiceParams.modLfoToPitch;
-        const baseDepth = Math.abs(modLfoToPitch) +
-            channel.state.modulationDepth;
-        const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
-        note.modulationDepth.gain
-            .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(modulationDepth, scheduleTime);
+        if (note.modulationDepth) {
+            const modLfoToPitch = note.voiceParams.modLfoToPitch;
+            const baseDepth = Math.abs(modLfoToPitch) + channel.state.modulationDepth;
+            const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
+            note.modulationDepth.gain
+                .cancelScheduledValues(scheduleTime)
+                .setValueAtTime(modulationDepth, scheduleTime);
+        }
+        else {
+            this.startModulation(channel, note, scheduleTime);
+        }
     }
     setModLfoToFilterFc(note, scheduleTime) {
         const modLfoToFilterFc = note.voiceParams.modLfoToFilterFc;
@@ -1058,7 +1092,7 @@ class MidyGM1 {
         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;
@@ -1102,9 +1136,10 @@ class MidyGM1 {
         handlers[101] = this.setRPNMSB;
         handlers[120] = this.allSoundOff;
         handlers[121] = this.resetAllControllers;
+        handlers[123] = this.allNotesOff;
         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);
@@ -1117,12 +1152,11 @@ class MidyGM1 {
     }
     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);
             }
             else {
-                this.setPitchEnvelope(note, scheduleTime);
                 this.startModulation(channel, note, scheduleTime);
             }
         });
@@ -1178,7 +1212,7 @@ class MidyGM1 {
         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);
             });
         }
@@ -1297,7 +1331,7 @@ class MidyGM1 {
         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;
@@ -1322,7 +1356,7 @@ class MidyGM1 {
             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;