@marmooo/midy 0.3.7 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.3.7",
+  "version": "0.4.0",
   "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.3",
+    "@marmooo/soundfont-parser": "^0.1.4",
     "midi-file": "^1.2.4"
   },
   "devDependencies": {

package/script/midy-GM1.d.ts

@@ -1,8 +1,8 @@
 export class MidyGM1 {
     static channelSettings: {
+        scheduleIndex: number;
         detune: number;
         programNumber: number;
-        bank: number;
         dataMSB: number;
         dataLSB: number;
         rpnMSB: number;
@@ -22,9 +22,10 @@ export class MidyGM1 {
     startTime: number;
     resumeTime: number;
     soundFonts: any[];
-    soundFontTable: any[];
+    soundFontTable: never[][];
     voiceCounter: Map<any, any>;
     voiceCache: Map<any, any>;
+    realtimeVoiceCache: Map<any, any>;
     isPlaying: boolean;
     isPausing: boolean;
     isPaused: boolean;
@@ -39,6 +40,7 @@ export class MidyGM1 {
     masterVolume: any;
     scheduler: any;
     schedulerBuffer: any;
+    messageHandlers: any[];
     voiceParamsHandlers: {
         modLfoToPitch: (channel: any, note: any, scheduleTime: any) => void;
         vibLfoToPitch: (_channel: any, _note: any, _scheduleTime: any) => void;
@@ -53,7 +55,6 @@ export class MidyGM1 {
     };
     controlChangeHandlers: any[];
     channels: any[];
-    initSoundFontTable(): any[];
     addSoundFont(soundFont: any): void;
     toUint8Array(input: any): Promise<Uint8Array<ArrayBuffer>>;
     loadSoundFont(input: any): Promise<void>;
@@ -68,13 +69,14 @@ export class MidyGM1 {
     createChannels(audioContext: any): any[];
     createAudioBuffer(voiceParams: any): Promise<any>;
     createBufferSource(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;
     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[];
@@ -103,19 +105,20 @@ export class MidyGM1 {
     clampCutoffFrequency(frequency: any): number;
     setFilterEnvelope(note: any, scheduleTime: any): void;
     startModulation(channel: any, note: any, scheduleTime: any): void;
-    getAudioBuffer(channel: any, noteNumber: any, velocity: any, voiceParams: any): Promise<any>;
-    createNote(channel: any, voice: any, noteNumber: any, velocity: any, startTime: any): Promise<Note>;
+    getAudioBuffer(channel: any, noteNumber: any, velocity: any, voiceParams: any, realtime: any): Promise<any>;
+    setNoteAudioNode(channel: any, note: any, realtime: any): Promise<any>;
     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>;
+    setNoteRouting(channelNumber: any, note: any, startTime: any): void;
+    noteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: 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;
+    noteOff(channelNumber: any, noteNumber: any, velocity: any, endTime: any, force: any): void;
     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>;
+    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;
@@ -172,26 +175,8 @@ export class MidyGM1 {
     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>;
 }
-declare class Note {
-    constructor(noteNumber: any, velocity: any, startTime: any, voice: any, voiceParams: any);
-    index: number;
-    ending: boolean;
-    bufferSource: any;
-    filterNode: any;
-    filterDepth: any;
-    volumeEnvelopeNode: any;
-    volumeDepth: any;
-    modulationLFO: any;
-    modulationDepth: any;
-    noteNumber: any;
-    velocity: any;
-    startTime: any;
-    voice: any;
-    voiceParams: any;
-}
-export {};
 //# sourceMappingURL=midy-GM1.d.ts.map

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;IAyBE;;;;;;;;;;;MAWE;IAEF,+BAcC;IAnDD,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,iBAAY;IACZ,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,uBAQC;IAED,yDA2BC;IAED,2BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;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,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;;;;;;;;;;;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,2DAMC;IAED,uDAkBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAMC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,6CAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAGD,6DAgBC;CACF;AAhiDD;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":"AA6FA;IA0BE;;;;;;;;;;;MAWE;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,kCAA+B;IAC/B,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,iBAAY;IACZ,gBAAc;IACd,oBAAkB;IAClB,sBAAwB;IACxB,2BAAqC;IAgBnC,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,4DASC;IAED,yEAqDC;IAED,mCAOC;IAED,uBASC;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,sBAIC;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,4GAkCC;IAED,uEAmCC;IAED,0EAiBC;IAED,oEASC;IAED,0FAwBC;IAED,gCASC;IAED,iEAqBC;IAED,4FAmBC;IAED,6CAUC;IAED,qDAUC;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,2DAMC;IAED,uDAkBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAMC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,6CAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCASC;IAED,4EAaC;IAED,4DAGC;IAED,qDAKC;IAED,gDAYC;IAGD,6DAgBC;CACF"}

package/script/midy-GM1.js

@@ -4,7 +4,19 @@ exports.MidyGM1 = void 0;
 const midi_file_1 = require("midi-file");
 const soundfont_parser_1 = require("@marmooo/soundfont-parser");
 class Note {
-    constructor(noteNumber, velocity, startTime, voice, voiceParams) {
+    constructor(noteNumber, velocity, startTime) {
+        Object.defineProperty(this, "voice", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "voiceParams", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "index", {
             enumerable: true,
             configurable: true,
@@ -17,6 +29,12 @@ class Note {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "pending", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
         Object.defineProperty(this, "bufferSource", {
             enumerable: true,
             configurable: true,
@@ -62,8 +80,6 @@ class Note {
         this.noteNumber = noteNumber;
         this.velocity = velocity;
         this.startTime = startTime;
-        this.voice = voice;
-        this.voiceParams = voiceParams;
     }
 }
 // normalized to 0-1 for use with the SF2 modulator model
@@ -203,7 +219,7 @@ class MidyGM1 {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: this.initSoundFontTable()
+            value: Array.from({ length: 128 }, () => [])
         });
         Object.defineProperty(this, "voiceCounter", {
             enumerable: true,
@@ -217,6 +233,12 @@ class MidyGM1 {
             writable: true,
             value: new Map()
         });
+        Object.defineProperty(this, "realtimeVoiceCache", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
         Object.defineProperty(this, "isPlaying", {
             enumerable: true,
             configurable: true,
@@ -284,6 +306,7 @@ class MidyGM1 {
             length: 1,
             sampleRate: audioContext.sampleRate,
         });
+        this.messageHandlers = this.createMessageHandlers();
         this.voiceParamsHandlers = this.createVoiceParamsHandlers();
         this.controlChangeHandlers = this.createControlChangeHandlers();
         this.channels = this.createChannels(audioContext);
@@ -291,21 +314,14 @@ class MidyGM1 {
         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) {
@@ -383,13 +399,16 @@ class MidyGM1 {
         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;
     }
@@ -438,19 +457,22 @@ class MidyGM1 {
         }
         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);
+                    await this.noteOn(event.channel, event.noteNumber, event.velocity, startTime);
                     break;
                 case "noteOff": {
-                    const notePromise = this.scheduleNoteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
+                    const notePromise = this.noteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
                     if (notePromise)
                         this.notePromises.push(notePromise);
                     break;
@@ -483,6 +505,7 @@ class MidyGM1 {
         this.exclusiveClassNotes.fill(undefined);
         this.drumExclusiveClassNotes.fill(undefined);
         this.voiceCache.clear();
+        this.realtimeVoiceCache.clear();
         for (let i = 0; i < this.channels.length; i++) {
             this.channels[i].scheduledNotes = [];
             this.resetChannelStates(i);
@@ -516,13 +539,10 @@ class MidyGM1 {
         this.isPaused = false;
         this.startTime = this.audioContext.currentTime;
         let queueIndex = this.getQueueIndex(this.resumeTime);
-        let resumeTime = this.resumeTime - this.startTime;
         let finished = false;
         this.notePromises = [];
         while (queueIndex < this.timeline.length) {
             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);
                 await this.audioContext.suspend();
@@ -541,10 +561,10 @@ class MidyGM1 {
                 const nextQueueIndex = this.getQueueIndex(this.resumeTime);
                 this.updateStates(queueIndex, nextQueueIndex);
                 queueIndex = nextQueueIndex;
-                resumeTime = this.resumeTime - this.startTime;
                 this.isSeeking = false;
                 continue;
             }
+            queueIndex = await this.scheduleTimelineEvents(now, queueIndex);
             const waitTime = now + this.noteCheckInterval;
             await this.scheduleTask(() => { }, waitTime);
         }
@@ -560,16 +580,16 @@ class MidyGM1 {
     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;
@@ -579,17 +599,15 @@ class MidyGM1 {
                 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;
@@ -624,7 +642,7 @@ class MidyGM1 {
         const channel = this.channels[channelNumber];
         const promises = [];
         this.processActiveNotes(channel, scheduleTime, (note) => {
-            const promise = this.scheduleNoteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force);
+            const promise = this.noteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force);
             this.notePromises.push(promise);
             promises.push(promise);
         });
@@ -634,7 +652,7 @@ class MidyGM1 {
         const channel = this.channels[channelNumber];
         const promises = [];
         this.processScheduledNotes(channel, (note) => {
-            const promise = this.scheduleNoteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force);
+            const promise = this.noteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force);
             this.notePromises.push(promise);
             promises.push(promise);
         });
@@ -667,7 +685,7 @@ class MidyGM1 {
         if (!this.isPlaying || this.isPaused)
             return;
         const now = this.audioContext.currentTime;
-        this.resumeTime += now - this.startTime - this.startDelay;
+        this.resumeTime = now - this.startTime - this.startDelay;
         this.isPausing = true;
         await this.playPromise;
         this.isPausing = false;
@@ -693,11 +711,13 @@ class MidyGM1 {
             if (totalTime < event.startTime)
                 totalTime = event.startTime;
         }
-        return totalTime;
+        return totalTime + this.startDelay;
     }
     currentTime() {
+        if (!this.isPlaying)
+            return this.resumeTime;
         const now = this.audioContext.currentTime;
-        return this.resumeTime + now - this.startTime - this.startDelay;
+        return now + this.resumeTime - this.startTime;
     }
     processScheduledNotes(channel, callback) {
         const scheduledNotes = channel.scheduledNotes;
@@ -836,31 +856,42 @@ class MidyGM1 {
         note.modulationLFO.connect(note.volumeDepth);
         note.volumeDepth.connect(note.volumeEnvelopeNode.gain);
     }
-    async getAudioBuffer(channel, noteNumber, velocity, voiceParams) {
+    async getAudioBuffer(channel, noteNumber, velocity, voiceParams, realtime) {
         const audioBufferId = this.getVoiceId(channel, noteNumber, velocity);
-        const cache = this.voiceCache.get(audioBufferId);
-        if (cache) {
-            cache.counter += 1;
-            if (cache.maxCount <= cache.counter) {
-                this.voiceCache.delete(audioBufferId);
-            }
-            return cache.audioBuffer;
-        }
-        else {
-            const maxCount = this.voiceCounter.get(audioBufferId) ?? 0;
+        if (realtime) {
+            const cachedAudioBuffer = this.realtimeVoiceCache.get(audioBufferId);
+            if (cachedAudioBuffer)
+                return cachedAudioBuffer;
             const audioBuffer = await this.createAudioBuffer(voiceParams);
-            const cache = { audioBuffer, maxCount, counter: 1 };
-            this.voiceCache.set(audioBufferId, cache);
+            this.realtimeVoiceCache.set(audioBufferId, audioBuffer);
             return audioBuffer;
         }
+        else {
+            const cache = this.voiceCache.get(audioBufferId);
+            if (cache) {
+                cache.counter += 1;
+                if (cache.maxCount <= cache.counter) {
+                    this.voiceCache.delete(audioBufferId);
+                }
+                return cache.audioBuffer;
+            }
+            else {
+                const maxCount = this.voiceCounter.get(audioBufferId) ?? 0;
+                const audioBuffer = await this.createAudioBuffer(voiceParams);
+                const cache = { audioBuffer, maxCount, counter: 1 };
+                this.voiceCache.set(audioBufferId, cache);
+                return audioBuffer;
+            }
+        }
     }
-    async createNote(channel, voice, noteNumber, velocity, startTime) {
+    async setNoteAudioNode(channel, note, realtime) {
         const now = this.audioContext.currentTime;
+        const { noteNumber, velocity, startTime } = note;
         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, noteNumber, velocity, voiceParams);
+        const voiceParams = note.voice.getAllParams(controllerState);
+        note.voiceParams = voiceParams;
+        const audioBuffer = await this.getAudioBuffer(channel, noteNumber, velocity, voiceParams, realtime);
         note.bufferSource = this.createBufferSource(voiceParams, audioBuffer);
         note.volumeEnvelopeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
@@ -887,37 +918,50 @@ class MidyGM1 {
         if (prev) {
             const [prevNote, prevChannelNumber] = prev;
             if (prevNote && !prevNote.ending) {
-                this.scheduleNoteOff(prevChannelNumber, prevNote.noteNumber, 0, // velocity,
+                this.noteOff(prevChannelNumber, prevNote.noteNumber, 0, // velocity,
                 startTime, true);
             }
         }
         this.exclusiveClassNotes[exclusiveClass] = [note, channelNumber];
     }
-    async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime) {
+    setNoteRouting(channelNumber, note, startTime) {
         const channel = this.channels[channelNumber];
-        const bankNumber = channel.bank;
-        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 note = await this.createNote(channel, voice, noteNumber, velocity, startTime);
-        note.volumeEnvelopeNode.connect(channel.gainL);
-        note.volumeEnvelopeNode.connect(channel.gainR);
+        const volumeEnvelopeNode = note.volumeEnvelopeNode;
+        volumeEnvelopeNode.connect(channel.gainL);
+        volumeEnvelopeNode.connect(channel.gainR);
         if (0.5 <= channel.state.sustainPedal) {
             channel.sustainNotes.push(note);
         }
         this.handleExclusiveClass(note, channelNumber, startTime);
+    }
+    async noteOn(channelNumber, noteNumber, velocity, startTime) {
+        const channel = this.channels[channelNumber];
+        const realtime = startTime === undefined;
+        if (realtime)
+            startTime = this.audioContext.currentTime;
+        const note = new Note(noteNumber, velocity, startTime);
         const scheduledNotes = channel.scheduledNotes;
         note.index = scheduledNotes.length;
         scheduledNotes.push(note);
-    }
-    noteOn(channelNumber, noteNumber, velocity, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
-        return this.scheduleNoteOn(channelNumber, noteNumber, velocity, scheduleTime, undefined);
+        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];
+        note.voice = soundFont.getVoice(bank, programNumber, noteNumber, velocity);
+        if (!note.voice)
+            return;
+        await this.setNoteAudioNode(channel, note, realtime);
+        this.setNoteRouting(channelNumber, note, startTime);
+        note.pending = false;
+        const off = note.offEvent;
+        if (off) {
+            this.noteOff(channelNumber, noteNumber, off.velocity, off.startTime);
+        }
     }
     disconnectNote(note) {
         note.bufferSource.disconnect();
@@ -930,6 +974,7 @@ class MidyGM1 {
         }
     }
     releaseNote(channel, note, endTime) {
+        endTime ??= this.audioContext.currentTime;
         const volRelease = endTime + note.voiceParams.volRelease;
         const modRelease = endTime + note.voiceParams.modRelease;
         const stopTime = Math.min(volRelease, modRelease);
@@ -950,7 +995,7 @@ class MidyGM1 {
             }, stopTime);
         });
     }
-    scheduleNoteOff(channelNumber, noteNumber, _velocity, endTime, force) {
+    noteOff(channelNumber, noteNumber, velocity, endTime, force) {
         const channel = this.channels[channelNumber];
         if (!force && 0.5 <= channel.state.sustainPedal)
             return;
@@ -958,6 +1003,10 @@ class MidyGM1 {
         if (index < 0)
             return;
         const note = channel.scheduledNotes[index];
+        if (note.pending) {
+            note.offEvent = { velocity, startTime: endTime };
+            return;
+        }
         note.ending = true;
         this.setNoteIndex(channel, index);
         this.releaseNote(channel, note, endTime);
@@ -988,22 +1037,37 @@ class MidyGM1 {
         }
         return -1;
     }
-    noteOff(channelNumber, noteNumber, velocity, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
-        return this.scheduleNoteOff(channelNumber, noteNumber, velocity, scheduleTime, false);
-    }
     releaseSustainPedal(channelNumber, halfVelocity, scheduleTime) {
         const velocity = halfVelocity * 2;
         const channel = this.channels[channelNumber];
         const promises = [];
         for (let i = 0; i < channel.sustainNotes.length; i++) {
-            const promise = this.scheduleNoteOff(channelNumber, channel.sustainNotes[i].noteNumber, velocity, scheduleTime);
+            const promise = this.noteOff(channelNumber, channel.sustainNotes[i].noteNumber, velocity, scheduleTime);
             promises.push(promise);
         }
         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) {
@@ -1431,10 +1495,8 @@ class MidyGM1 {
         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) {
@@ -1455,16 +1517,11 @@ class MidyGM1 {
         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]) {
@@ -1502,9 +1559,9 @@ Object.defineProperty(MidyGM1, "channelSettings", {
     configurable: true,
     writable: true,
     value: {
+        scheduleIndex: 0,
         detune: 0,
         programNumber: 0,
-        bank: 0,
         dataMSB: 0,
         dataLSB: 0,
         rpnMSB: 127,