@marmooo/midy 0.3.6 → 0.3.8

package/esm/midy-GMLite.d.ts

@@ -3,7 +3,6 @@ export class MidyGMLite {
         scheduleIndex: number;
         detune: number;
         programNumber: number;
-        bank: number;
         dataMSB: number;
         dataLSB: number;
         rpnMSB: number;
@@ -21,7 +20,7 @@ export class MidyGMLite {
     startTime: number;
     resumeTime: number;
     soundFonts: any[];
-    soundFontTable: any[];
+    soundFontTable: never[][];
     voiceCounter: Map<any, any>;
     voiceCache: Map<any, any>;
     isPlaying: boolean;
@@ -29,6 +28,7 @@ export class MidyGMLite {
     isPaused: boolean;
     isStopping: boolean;
     isSeeking: boolean;
+    playPromise: any;
     timeline: any[];
     notePromises: any[];
     instruments: Set<any>;
@@ -38,21 +38,21 @@ export class MidyGMLite {
     masterVolume: any;
     scheduler: any;
     schedulerBuffer: any;
+    messageHandlers: any[];
     voiceParamsHandlers: {
-        modLfoToPitch: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        vibLfoToPitch: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        modLfoToFilterFc: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        modLfoToVolume: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        chorusEffectsSend: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        reverbEffectsSend: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        delayModLFO: (_channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        freqModLFO: (_channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        delayVibLFO: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        freqVibLFO: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
+        modLfoToPitch: (channel: any, note: any, scheduleTime: any) => void;
+        vibLfoToPitch: (_channel: any, _note: any, _scheduleTime: any) => void;
+        modLfoToFilterFc: (channel: any, note: any, scheduleTime: any) => void;
+        modLfoToVolume: (channel: any, note: any, scheduleTime: any) => void;
+        chorusEffectsSend: (_channel: any, _note: any, _scheduleTime: any) => void;
+        reverbEffectsSend: (_channel: any, _note: any, _scheduleTime: any) => void;
+        delayModLFO: (_channel: any, note: any, scheduleTime: any) => void;
+        freqModLFO: (_channel: any, note: any, scheduleTime: any) => void;
+        delayVibLFO: (_channel: any, _note: any, _scheduleTime: any) => void;
+        freqVibLFO: (_channel: any, _note: any, _scheduleTime: any) => void;
     };
     controlChangeHandlers: any[];
     channels: any[];
-    initSoundFontTable(): any[];
     addSoundFont(soundFont: any): void;
     toUint8Array(input: any): Promise<Uint8Array<ArrayBuffer>>;
     loadSoundFont(input: any): Promise<void>;
@@ -67,11 +67,14 @@ export class MidyGMLite {
     createChannels(audioContext: any): any[];
     createAudioBuffer(voiceParams: any): Promise<any>;
     createBufferSource(channel: any, voiceParams: any, audioBuffer: any): any;
-    scheduleTimelineEvents(t: any, resumeTime: any, queueIndex: any): Promise<any>;
+    scheduleTimelineEvents(scheduleTime: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
-    playNotes(): Promise<any>;
+    resetAllStates(): void;
+    updateStates(queueIndex: any, nextQueueIndex: any): void;
+    playNotes(): Promise<void>;
     ticksToSecond(ticks: any, secondsPerBeat: any): number;
     secondToTicks(second: any, secondsPerBeat: any): number;
+    getSoundFontId(channel: any): string;
     extractMidiData(midi: any): {
         instruments: Set<any>;
         timeline: any[];
@@ -80,8 +83,8 @@ export class MidyGMLite {
     stopChannelNotes(channelNumber: any, velocity: any, force: any, scheduleTime: any): Promise<any[]>;
     stopNotes(velocity: any, force: any, scheduleTime: any): Promise<any[]>;
     start(): Promise<void>;
-    stop(): void;
-    pause(): void;
+    stop(): Promise<void>;
+    pause(): Promise<void>;
     resume(): Promise<void>;
     seekTo(second: any): void;
     calcTotalTime(): number;
@@ -113,7 +116,9 @@ export class MidyGMLite {
     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>;
+    createMessageHandlers(): any[];
+    handleMessage(data: any, scheduleTime: any): void;
+    handleChannelMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<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;
@@ -123,16 +128,16 @@ export class MidyGMLite {
     setDelayModLFO(note: any, scheduleTime: any): void;
     setFreqModLFO(note: any, scheduleTime: any): void;
     createVoiceParamsHandlers(): {
-        modLfoToPitch: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        vibLfoToPitch: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        modLfoToFilterFc: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        modLfoToVolume: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        chorusEffectsSend: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        reverbEffectsSend: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        delayModLFO: (_channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        freqModLFO: (_channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        delayVibLFO: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        freqVibLFO: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
+        modLfoToPitch: (channel: any, note: any, scheduleTime: any) => void;
+        vibLfoToPitch: (_channel: any, _note: any, _scheduleTime: any) => void;
+        modLfoToFilterFc: (channel: any, note: any, scheduleTime: any) => void;
+        modLfoToVolume: (channel: any, note: any, scheduleTime: any) => void;
+        chorusEffectsSend: (_channel: any, _note: any, _scheduleTime: any) => void;
+        reverbEffectsSend: (_channel: any, _note: any, _scheduleTime: any) => void;
+        delayModLFO: (_channel: any, note: any, scheduleTime: any) => void;
+        freqModLFO: (_channel: any, note: any, scheduleTime: any) => void;
+        delayVibLFO: (_channel: any, _note: any, _scheduleTime: any) => void;
+        freqVibLFO: (_channel: any, _note: any, _scheduleTime: any) => void;
     };
     getControllerState(channel: any, noteNumber: any, velocity: any): Float32Array<any>;
     applyVoiceParams(channel: any, controllerType: any, scheduleTime: any): void;
@@ -158,14 +163,14 @@ export class MidyGMLite {
     handlePitchBendRangeRPN(channelNumber: any, scheduleTime: any): void;
     setPitchBendRange(channelNumber: any, value: any, scheduleTime: any): void;
     allSoundOff(channelNumber: any, _value: any, scheduleTime: any): Promise<any[]>;
-    resetAllStates(channelNumber: any): void;
+    resetChannelStates(channelNumber: any): void;
     resetAllControllers(channelNumber: any, _value: any, scheduleTime: any): void;
     allNotesOff(channelNumber: any, _value: any, scheduleTime: any): Promise<any[]>;
     handleUniversalNonRealTimeExclusiveMessage(data: any, scheduleTime: any): void;
     GM1SystemOn(scheduleTime: any): void;
     handleUniversalRealTimeExclusiveMessage(data: any, scheduleTime: any): void;
     handleMasterVolumeSysEx(data: any, scheduleTime: any): void;
-    setMasterVolume(volume: any, scheduleTime: any): void;
+    setMasterVolume(value: any, scheduleTime: any): void;
     handleSysEx(data: any, scheduleTime: any): void;
     scheduleTask(callback: any, scheduleTime: any): Promise<any>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AA0GA;IA2BE;;;;;;;;;;MAUE;IAEF,+BAcC;IApDD,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;IACrC,+BAEE;IAeA,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,0EAUC;IAED,+EAkDC;IAED,mCAOC;IAED,0BAiEC;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,wCAIC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,6FAyBC;IAED,oGAuCC;IAED,0EAiBC;IAED,8EAiBC;IAED,kGAoCC;IAED,6FASC;IAED,gCASC;IAED,iEAoBC;IAED,qGAkBC;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,uDAYC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,gFAGC;IAED,yCAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAGD,6DAgBC;CACF;AAx/CD;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-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AA0GA;IA4BE;;;;;;;;;MASE;IAEF,+BAeC;IArDD,aAAa;IACb,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,0BAAuD;IACvD,4BAAyB;IACzB,0BAAuB;IACvB,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,iBAAY;IACZ,gBAAc;IACd,oBAAkB;IAClB,sBAAwB;IACxB,2BAAqC;IACrC,+BAEE;IAcA,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF,uBAAmD;IACnD;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,gBAAiD;IAMnD,mCASC;IAED,2DAYC;IAED,yCAmBC;IAED,oCASC;IAED,sBAoCC;IAED,8DAWC;IAED;;;;MAeC;IAED,yCAaC;IAED,kDAUC;IAED,0EAUC;IAED,yEAqDC;IAED,mCAOC;IAED,uBAQC;IAED,yDA2BC;IAED,2BAwCC;IAED,uDAEC;IAED,wDAEC;IAED,qCAKC;IAED;;;MAwDC;IAED,kGAeC;IAED,mGAeC;IAED,wEAMC;IAED,uBAMC;IAED,sBAKC;IAED,uBAQC;IAED,wBAKC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,yDAQC;IAED,yEASC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,wCAIC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,6FAyBC;IAED,oGA2CC;IAED,0EAiBC;IAED,8EAiBC;IAED,kGAiCC;IAED,6FASC;IAED,gCASC;IAED,iEAoBC;IAED,qGAkBC;IAED,6CAUC;IAED,qDAUC;IAED,qFASC;IAED,sFAeC;IAED,+BAmBC;IAED,kDAOC;IAED,uGA2BC;IAED,mFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAWC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MAiCC;IAED,oFAMC;IAED,6EA2BC;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,uDAYC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,gFAGC;IAED,6CAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCASC;IAED,4EAaC;IAED,4DAGC;IAED,qDAKC;IAED,gDAYC;IAGD,6DAgBC;CACF;AA9hDD;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/esm/midy-GMLite.js

@@ -213,7 +213,7 @@ export class MidyGMLite {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: this.initSoundFontTable()
+            value: Array.from({ length: 128 }, () => [])
         });
         Object.defineProperty(this, "voiceCounter", {
             enumerable: true,
@@ -257,6 +257,12 @@ export class MidyGMLite {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "playPromise", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "timeline", {
             enumerable: true,
             configurable: true,
@@ -294,6 +300,7 @@ export class MidyGMLite {
             length: 1,
             sampleRate: audioContext.sampleRate,
         });
+        this.messageHandlers = this.createMessageHandlers();
         this.voiceParamsHandlers = this.createVoiceParamsHandlers();
         this.controlChangeHandlers = this.createControlChangeHandlers();
         this.channels = this.createChannels(audioContext);
@@ -301,21 +308,14 @@ export class MidyGMLite {
         this.scheduler.connect(audioContext.destination);
         this.GM1SystemOn();
     }
-    initSoundFontTable() {
-        const table = new Array(128);
-        for (let i = 0; i < 128; i++) {
-            table[i] = new Map();
-        }
-        return table;
-    }
     addSoundFont(soundFont) {
         const index = this.soundFonts.length;
         this.soundFonts.push(soundFont);
         const presetHeaders = soundFont.parsed.presetHeaders;
+        const soundFontTable = this.soundFontTable;
         for (let i = 0; i < presetHeaders.length; i++) {
-            const presetHeader = presetHeaders[i];
-            const banks = this.soundFontTable[presetHeader.preset];
-            banks.set(presetHeader.bank, index);
+            const { preset, bank } = presetHeaders[i];
+            soundFontTable[preset][bank] = index;
         }
     }
     async toUint8Array(input) {
@@ -393,13 +393,16 @@ export class MidyGMLite {
         this.GM1SystemOn();
     }
     getVoiceId(channel, noteNumber, velocity) {
-        const bankNumber = this.calcBank(channel);
-        const soundFontIndex = this.soundFontTable[channel.programNumber]
-            .get(bankNumber);
+        const programNumber = channel.programNumber;
+        const bankTable = this.soundFontTable[programNumber];
+        if (!bankTable)
+            return;
+        const bank = channel.isDrum ? 128 : 0;
+        const soundFontIndex = bankTable[bank];
         if (soundFontIndex === undefined)
             return;
         const soundFont = this.soundFonts[soundFontIndex];
-        const voice = soundFont.getVoice(bankNumber, channel.programNumber, noteNumber, velocity);
+        const voice = soundFont.getVoice(bank, programNumber, noteNumber, velocity);
         const { instrument, sampleID } = voice.generators;
         return soundFontIndex * (2 ** 32) + (instrument << 16) + sampleID;
     }
@@ -450,13 +453,16 @@ export class MidyGMLite {
         }
         return bufferSource;
     }
-    async scheduleTimelineEvents(t, resumeTime, queueIndex) {
-        while (queueIndex < this.timeline.length) {
-            const event = this.timeline[queueIndex];
-            if (event.startTime > t + this.lookAhead)
+    async scheduleTimelineEvents(scheduleTime, queueIndex) {
+        const timeOffset = this.resumeTime - this.startTime;
+        const lookAheadCheckTime = scheduleTime + timeOffset + this.lookAhead;
+        const schedulingOffset = this.startDelay - timeOffset;
+        const timeline = this.timeline;
+        while (queueIndex < timeline.length) {
+            const event = timeline[queueIndex];
+            if (lookAheadCheckTime < event.startTime)
                 break;
-            const delay = this.startDelay - resumeTime;
-            const startTime = event.startTime + delay;
+            const startTime = event.startTime + schedulingOffset;
             switch (event.type) {
                 case "noteOn":
                     await this.scheduleNoteOn(event.channel, event.noteNumber, event.velocity, startTime);
@@ -491,70 +497,77 @@ export class MidyGMLite {
         }
         return 0;
     }
-    playNotes() {
-        return new Promise((resolve) => {
-            this.isPlaying = true;
-            this.isPaused = false;
-            this.startTime = this.audioContext.currentTime;
-            let queueIndex = this.getQueueIndex(this.resumeTime);
-            let resumeTime = this.resumeTime - this.startTime;
+    resetAllStates() {
+        this.exclusiveClassNotes.fill(undefined);
+        this.drumExclusiveClassNotes.fill(undefined);
+        this.voiceCache.clear();
+        for (let i = 0; i < this.channels.length; i++) {
+            this.channels[i].scheduledNotes = [];
+            this.resetChannelStates(i);
+        }
+    }
+    updateStates(queueIndex, nextQueueIndex) {
+        if (nextQueueIndex < queueIndex)
+            queueIndex = 0;
+        for (let i = queueIndex; i < nextQueueIndex; i++) {
+            const event = this.timeline[i];
+            switch (event.type) {
+                case "controller":
+                    this.setControlChange(event.channel, event.controllerType, event.value, 0);
+                    break;
+                case "programChange":
+                    this.setProgramChange(event.channel, event.programNumber, 0);
+                    break;
+                case "pitchBend":
+                    this.setPitchBend(event.channel, event.value + 8192, 0);
+                    break;
+                case "sysEx":
+                    this.handleSysEx(event.data, 0);
+            }
+        }
+    }
+    async playNotes() {
+        if (this.audioContext.state === "suspended") {
+            await this.audioContext.resume();
+        }
+        this.isPlaying = true;
+        this.isPaused = false;
+        this.startTime = this.audioContext.currentTime;
+        let queueIndex = this.getQueueIndex(this.resumeTime);
+        let finished = false;
+        this.notePromises = [];
+        while (queueIndex < this.timeline.length) {
+            const now = this.audioContext.currentTime;
+            queueIndex = await this.scheduleTimelineEvents(now, queueIndex);
+            if (this.isPausing) {
+                await this.stopNotes(0, true, now);
+                await this.audioContext.suspend();
+                this.notePromises = [];
+                break;
+            }
+            else if (this.isStopping) {
+                await this.stopNotes(0, true, now);
+                await this.audioContext.suspend();
+                finished = true;
+                break;
+            }
+            else if (this.isSeeking) {
+                await this.stopNotes(0, true, now);
+                this.startTime = this.audioContext.currentTime;
+                const nextQueueIndex = this.getQueueIndex(this.resumeTime);
+                this.updateStates(queueIndex, nextQueueIndex);
+                queueIndex = nextQueueIndex;
+                this.isSeeking = false;
+                continue;
+            }
+            const waitTime = now + this.noteCheckInterval;
+            await this.scheduleTask(() => { }, waitTime);
+        }
+        if (finished) {
             this.notePromises = [];
-            const schedulePlayback = async () => {
-                if (queueIndex >= this.timeline.length) {
-                    await Promise.all(this.notePromises);
-                    this.notePromises = [];
-                    this.exclusiveClassNotes.fill(undefined);
-                    this.drumExclusiveClassNotes.fill(undefined);
-                    this.voiceCache.clear();
-                    for (let i = 0; i < this.channels.length; i++) {
-                        this.resetAllStates(i);
-                    }
-                    resolve();
-                    return;
-                }
-                const now = this.audioContext.currentTime;
-                const t = now + resumeTime;
-                queueIndex = await this.scheduleTimelineEvents(t, resumeTime, queueIndex);
-                if (this.isPausing) {
-                    await this.stopNotes(0, true, now);
-                    this.notePromises = [];
-                    this.isPausing = false;
-                    this.isPaused = true;
-                    resolve();
-                    return;
-                }
-                else if (this.isStopping) {
-                    await this.stopNotes(0, true, now);
-                    this.notePromises = [];
-                    this.exclusiveClassNotes.fill(undefined);
-                    this.drumExclusiveClassNotes.fill(undefined);
-                    this.voiceCache.clear();
-                    for (let i = 0; i < this.channels.length; i++) {
-                        this.resetAllStates(i);
-                    }
-                    this.isStopping = false;
-                    this.isPaused = false;
-                    resolve();
-                    return;
-                }
-                else if (this.isSeeking) {
-                    this.stopNotes(0, true, now);
-                    this.exclusiveClassNotes.fill(undefined);
-                    this.drumExclusiveClassNotes.fill(undefined);
-                    this.startTime = this.audioContext.currentTime;
-                    queueIndex = this.getQueueIndex(this.resumeTime);
-                    resumeTime = this.resumeTime - this.startTime;
-                    this.isSeeking = false;
-                    await schedulePlayback();
-                }
-                else {
-                    const waitTime = now + this.noteCheckInterval;
-                    await this.scheduleTask(() => { }, waitTime);
-                    await schedulePlayback();
-                }
-            };
-            schedulePlayback();
-        });
+            this.resetAllStates();
+        }
+        this.isPlaying = false;
     }
     ticksToSecond(ticks, secondsPerBeat) {
         return ticks * secondsPerBeat / this.ticksPerBeat;
@@ -562,16 +575,16 @@ export class MidyGMLite {
     secondToTicks(second, secondsPerBeat) {
         return second * this.ticksPerBeat / secondsPerBeat;
     }
+    getSoundFontId(channel) {
+        const programNumber = channel.programNumber;
+        const bank = channel.isDrum ? "128" : "000";
+        const program = programNumber.toString().padStart(3, "0");
+        return `${bank}:${program}`;
+    }
     extractMidiData(midi) {
         const instruments = new Set();
         const timeline = [];
-        const tmpChannels = new Array(this.channels.length);
-        for (let i = 0; i < tmpChannels.length; i++) {
-            tmpChannels[i] = {
-                programNumber: -1,
-                bank: this.channels[i].bank,
-            };
-        }
+        const channels = this.channels;
         for (let i = 0; i < midi.tracks.length; i++) {
             const track = midi.tracks[i];
             let currentTicks = 0;
@@ -581,17 +594,15 @@ export class MidyGMLite {
                 event.ticks = currentTicks;
                 switch (event.type) {
                     case "noteOn": {
-                        const channel = tmpChannels[event.channel];
-                        if (channel.programNumber < 0) {
-                            instruments.add(`${channel.bank}:0`);
-                            channel.programNumber = 0;
-                        }
+                        const channel = channels[event.channel];
+                        instruments.add(this.getSoundFontId(channel));
                         break;
                     }
                     case "programChange": {
-                        const channel = tmpChannels[event.channel];
-                        channel.programNumber = event.programNumber;
-                        instruments.add(`${channel.bankNumber}:${channel.programNumber}`);
+                        const channel = channels[event.channel];
+                        this.setProgramChange(event.channel, event.programNumber);
+                        instruments.add(this.getSoundFontId(channel));
+                        break;
                     }
                 }
                 delete event.deltaTime;
@@ -655,26 +666,32 @@ export class MidyGMLite {
         this.resumeTime = 0;
         if (this.voiceCounter.size === 0)
             this.cacheVoiceIds();
-        await this.playNotes();
-        this.isPlaying = false;
+        this.playPromise = this.playNotes();
+        await this.playPromise;
     }
-    stop() {
+    async stop() {
         if (!this.isPlaying)
             return;
         this.isStopping = true;
+        await this.playPromise;
+        this.isStopping = false;
     }
-    pause() {
+    async pause() {
         if (!this.isPlaying || this.isPaused)
             return;
         const now = this.audioContext.currentTime;
         this.resumeTime += now - this.startTime - this.startDelay;
         this.isPausing = true;
+        await this.playPromise;
+        this.isPausing = false;
+        this.isPaused = true;
     }
     async resume() {
         if (!this.isPaused)
             return;
-        await this.playNotes();
-        this.isPlaying = false;
+        this.playPromise = this.playNotes();
+        await this.playPromise;
+        this.isPaused = false;
     }
     seekTo(second) {
         this.resumeTime = second;
@@ -855,7 +872,7 @@ export class MidyGMLite {
         const voiceParams = voice.getAllParams(controllerState);
         const note = new Note(noteNumber, velocity, startTime, voice, voiceParams);
         const audioBuffer = await this.getAudioBuffer(channel, noteNumber, velocity, voiceParams);
-        note.bufferSource = this.createBufferSource(voiceParams, audioBuffer);
+        note.bufferSource = this.createBufferSource(channel, voiceParams, audioBuffer);
         note.volumeEnvelopeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
             type: "lowpass",
@@ -891,7 +908,7 @@ export class MidyGMLite {
         const channel = this.channels[channelNumber];
         if (!channel.isDrum)
             return;
-        const drumExclusiveClass = drumExclusiveClasses[noteNumber];
+        const drumExclusiveClass = drumExclusiveClasses[note.noteNumber];
         if (drumExclusiveClass === 0)
             return;
         const index = drumExclusiveClass * this.channels.length + channelNumber;
@@ -904,13 +921,16 @@ export class MidyGMLite {
     }
     async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime) {
         const channel = this.channels[channelNumber];
-        const bankNumber = channel.bank;
-        const soundFontIndex = this.soundFontTable[channel.programNumber]
-            .get(bankNumber);
+        const programNumber = channel.programNumber;
+        const bankTable = this.soundFontTable[programNumber];
+        if (!bankTable)
+            return;
+        const bank = channel.isDrum ? 128 : 0;
+        const soundFontIndex = bankTable[bank];
         if (soundFontIndex === undefined)
             return;
         const soundFont = this.soundFonts[soundFontIndex];
-        const voice = soundFont.getVoice(bankNumber, channel.programNumber, noteNumber, velocity);
+        const voice = soundFont.getVoice(bank, programNumber, noteNumber, velocity);
         if (!voice)
             return;
         const note = await this.createNote(channel, voice, noteNumber, velocity, startTime);
@@ -1017,7 +1037,26 @@ export class MidyGMLite {
         channel.sustainNotes = [];
         return promises;
     }
-    handleMIDIMessage(statusByte, data1, data2, scheduleTime) {
+    createMessageHandlers() {
+        const handlers = new Array(256);
+        // Channel Message
+        handlers[0x80] = (data, scheduleTime) => this.noteOff(data[0] & 0x0F, data[1], data[2], scheduleTime);
+        handlers[0x90] = (data, scheduleTime) => this.noteOn(data[0] & 0x0F, data[1], data[2], scheduleTime);
+        handlers[0xB0] = (data, scheduleTime) => this.setControlChange(data[0] & 0x0F, data[1], data[2], scheduleTime);
+        handlers[0xC0] = (data, scheduleTime) => this.setProgramChange(data[0] & 0x0F, data[1], scheduleTime);
+        handlers[0xE0] = (data, scheduleTime) => this.handlePitchBendMessage(data[0] & 0x0F, data[1], data[2], scheduleTime);
+        return handlers;
+    }
+    handleMessage(data, scheduleTime) {
+        const status = data[0];
+        if (status === 0xF0) {
+            return this.handleSysEx(data.subarray(1), scheduleTime);
+        }
+        const handler = this.messageHandlers[status];
+        if (handler)
+            handler(data, scheduleTime);
+    }
+    handleChannelMessage(statusByte, data1, data2, scheduleTime) {
         const channelNumber = statusByte & 0x0F;
         const messageType = statusByte & 0xF0;
         switch (messageType) {
@@ -1097,28 +1136,36 @@ export class MidyGMLite {
     }
     createVoiceParamsHandlers() {
         return {
-            modLfoToPitch: (channel, note, _prevValue, scheduleTime) => {
+            modLfoToPitch: (channel, note, scheduleTime) => {
                 if (0 < channel.state.modulationDepth) {
                     this.setModLfoToPitch(channel, note, scheduleTime);
                 }
             },
-            vibLfoToPitch: (_channel, _note, _prevValue, _scheduleTime) => { },
-            modLfoToFilterFc: (channel, note, _prevValue, scheduleTime) => {
+            vibLfoToPitch: (_channel, _note, _scheduleTime) => { },
+            modLfoToFilterFc: (channel, note, scheduleTime) => {
                 if (0 < channel.state.modulationDepth) {
                     this.setModLfoToFilterFc(note, scheduleTime);
                 }
             },
-            modLfoToVolume: (channel, note, _prevValue, scheduleTime) => {
+            modLfoToVolume: (channel, note, scheduleTime) => {
                 if (0 < channel.state.modulationDepth) {
                     this.setModLfoToVolume(note, scheduleTime);
                 }
             },
-            chorusEffectsSend: (_channel, _note, _prevValue, _scheduleTime) => { },
-            reverbEffectsSend: (_channel, _note, _prevValue, _scheduleTime) => { },
-            delayModLFO: (_channel, note, _prevValue, scheduleTime) => this.setDelayModLFO(note, scheduleTime),
-            freqModLFO: (_channel, note, _prevValue, scheduleTime) => this.setFreqModLFO(note, scheduleTime),
-            delayVibLFO: (_channel, _note, _prevValue, _scheduleTime) => { },
-            freqVibLFO: (_channel, _note, _prevValue, _scheduleTime) => { },
+            chorusEffectsSend: (_channel, _note, _scheduleTime) => { },
+            reverbEffectsSend: (_channel, _note, _scheduleTime) => { },
+            delayModLFO: (_channel, note, scheduleTime) => {
+                if (0 < channel.state.modulationDepth) {
+                    this.setDelayModLFO(note, scheduleTime);
+                }
+            },
+            freqModLFO: (_channel, note, scheduleTime) => {
+                if (0 < channel.state.modulationDepth) {
+                    this.setFreqModLFO(note, scheduleTime);
+                }
+            },
+            delayVibLFO: (_channel, _note, _scheduleTime) => { },
+            freqVibLFO: (_channel, _note, _scheduleTime) => { },
         };
     }
     getControllerState(channel, noteNumber, velocity) {
@@ -1141,7 +1188,7 @@ export class MidyGMLite {
                     continue;
                 note.voiceParams[key] = value;
                 if (key in this.voiceParamsHandlers) {
-                    this.voiceParamsHandlers[key](channel, note, prevValue, scheduleTime);
+                    this.voiceParamsHandlers[key](channel, note, scheduleTime);
                 }
                 else {
                     if (volumeEnvelopeKeySet.has(key))
@@ -1298,8 +1345,8 @@ export class MidyGMLite {
     }
     handlePitchBendRangeRPN(channelNumber, scheduleTime) {
         const channel = this.channels[channelNumber];
-        this.limitData(channel, 0, 127, 0, 99);
-        const pitchBendRange = channel.dataMSB + channel.dataLSB / 100;
+        this.limitData(channel, 0, 127, 0, 127);
+        const pitchBendRange = (channel.dataMSB + channel.dataLSB / 128) * 100;
         this.setPitchBendRange(channelNumber, pitchBendRange, scheduleTime);
     }
     setPitchBendRange(channelNumber, value, scheduleTime) {
@@ -1307,7 +1354,7 @@ export class MidyGMLite {
         scheduleTime ??= this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheelSensitivity;
-        const next = value / 128;
+        const next = value / 12800;
         state.pitchWheelSensitivity = next;
         channel.detune += (state.pitchWheel * 2 - 1) * (next - prev) * 12800;
         this.updateChannelDetune(channel, scheduleTime);
@@ -1317,7 +1364,7 @@ export class MidyGMLite {
         scheduleTime ??= this.audioContext.currentTime;
         return this.stopActiveNotes(channelNumber, 0, true, scheduleTime);
     }
-    resetAllStates(channelNumber) {
+    resetChannelStates(channelNumber) {
         const scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const state = channel.state;
@@ -1392,10 +1439,8 @@ export class MidyGMLite {
         for (let i = 0; i < this.channels.length; i++) {
             this.allSoundOff(i, 0, scheduleTime);
             const channel = this.channels[i];
-            channel.bank = 0;
             channel.isDrum = false;
         }
-        this.channels[9].bank = 128;
         this.channels[9].isDrum = true;
     }
     handleUniversalRealTimeExclusiveMessage(data, scheduleTime) {
@@ -1416,16 +1461,11 @@ export class MidyGMLite {
         const volume = (data[5] * 128 + data[4]) / 16383;
         this.setMasterVolume(volume, scheduleTime);
     }
-    setMasterVolume(volume, scheduleTime) {
+    setMasterVolume(value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
-        if (volume < 0 && 1 < volume) {
-            console.error("Master Volume is out of range");
-        }
-        else {
-            this.masterVolume.gain
-                .cancelScheduledValues(scheduleTime)
-                .setValueAtTime(volume * volume, scheduleTime);
-        }
+        this.masterVolume.gain
+            .cancelScheduledValues(scheduleTime)
+            .setValueAtTime(value * value, scheduleTime);
     }
     handleSysEx(data, scheduleTime) {
         switch (data[0]) {
@@ -1465,7 +1505,6 @@ Object.defineProperty(MidyGMLite, "channelSettings", {
         scheduleIndex: 0,
         detune: 0,
         programNumber: 0,
-        bank: 0,
         dataMSB: 0,
         dataLSB: 0,
         rpnMSB: 127,