@marmooo/midy 0.3.8 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.3.8",
+  "version": "0.4.1",
   "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.4",
+    "@marmooo/soundfont-parser": "^0.1.5",
     "midi-file": "^1.2.4"
   },
   "devDependencies": {

package/script/midy-GM1.d.ts

@@ -25,6 +25,7 @@ export class MidyGM1 {
     soundFontTable: never[][];
     voiceCounter: Map<any, any>;
     voiceCache: Map<any, any>;
+    realtimeVoiceCache: Map<any, any>;
     isPlaying: boolean;
     isPausing: boolean;
     isPaused: boolean;
@@ -104,21 +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): Promise<any> | undefined;
     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[];
+    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): (Promise<any> | undefined)[];
     createMessageHandlers(): any[];
     handleMessage(data: any, scheduleTime: any): void;
-    handleChannelMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<void>;
+    handleChannelMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<any>;
     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;
@@ -179,22 +179,4 @@ export class MidyGM1 {
     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,+BAeC;IApDD,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;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,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,qCAMC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,6FAyBC;IAED,oGAuCC;IAED,0EAiBC;IAED,kGAgCC;IAED,6FASC;IAED,gCASC;IAED,iEAoBC;IAED,qGAeC;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,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;AAtiDD;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,kDASC;IAED,4DASC;IAED,yEAoDC;IAED,mCAOC;IAED,uBASC;IAED,yDA2BC;IAED,2BA8CC;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,uEAwCC;IAED,0EAiBC;IAED,oEASC;IAED,0FAwBC;IAED,gCASC;IAED,iEAqBC;IAED,gHAqBC;IAED,6CAUC;IAED,qDAUC;IAED,4GAeC;IAED,+BAmBC;IAED,kDAOC;IAED,sGA2BC;IAED,mFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAYC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MAiCC;IAED,oFAMC;IAED,6EA2BC;IAED,qCAeC;IAED,+FAWC;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,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
@@ -73,11 +89,11 @@ const defaultControllerState = {
     pitchWheel: { type: 14, defaultValue: 8192 / 16383 },
     pitchWheelSensitivity: { type: 16, defaultValue: 2 / 128 },
     link: { type: 127, defaultValue: 0 },
-    modulationDepth: { type: 128 + 1, defaultValue: 0 },
+    modulationDepthMSB: { type: 128 + 1, defaultValue: 0 },
     // dataMSB: { type: 128 + 6, defaultValue: 0, },
-    volume: { type: 128 + 7, defaultValue: 100 / 127 },
-    pan: { type: 128 + 10, defaultValue: 64 / 127 },
-    expression: { type: 128 + 11, defaultValue: 1 },
+    volumeMSB: { type: 128 + 7, defaultValue: 100 / 127 },
+    panMSB: { type: 128 + 10, defaultValue: 64 / 127 },
+    expressionMSB: { type: 128 + 11, defaultValue: 1 },
     // dataLSB: { type: 128 + 38, defaultValue: 0, },
     sustainPedal: { type: 128 + 64, defaultValue: 0 },
     // rpnLSB: { type: 128 + 100, defaultValue: 127 },
@@ -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,
@@ -391,7 +413,7 @@ class MidyGM1 {
         return soundFontIndex * (2 ** 32) + (instrument << 16) + sampleID;
     }
     createChannelAudioNodes(audioContext) {
-        const { gainLeft, gainRight } = this.panToGain(defaultControllerState.pan.defaultValue);
+        const { gainLeft, gainRight } = this.panToGain(defaultControllerState.panMSB.defaultValue);
         const gainL = new GainNode(audioContext, { gain: gainLeft });
         const gainR = new GainNode(audioContext, { gain: gainRight });
         const merger = new ChannelMergerNode(audioContext, { numberOfInputs: 2 });
@@ -419,10 +441,9 @@ class MidyGM1 {
         return channels;
     }
     async createAudioBuffer(voiceParams) {
-        const sample = voiceParams.sample;
-        const sampleStart = voiceParams.start;
-        const sampleEnd = sample.data.length + voiceParams.end;
-        const audioBuffer = await sample.toAudioBuffer(this.audioContext, sampleStart, sampleEnd);
+        const { sample, start, end } = voiceParams;
+        const sampleEnd = sample.data.length + end;
+        const audioBuffer = await sample.toAudioBuffer(this.audioContext, start, sampleEnd);
         return audioBuffer;
     }
     createBufferSource(voiceParams, audioBuffer) {
@@ -447,12 +468,10 @@ class MidyGM1 {
             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);
-                    if (notePromise)
-                        this.notePromises.push(notePromise);
+                    this.noteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
                     break;
                 }
                 case "controller":
@@ -483,6 +502,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);
@@ -520,7 +540,6 @@ class MidyGM1 {
         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();
@@ -542,9 +561,16 @@ class MidyGM1 {
                 this.isSeeking = false;
                 continue;
             }
+            queueIndex = await this.scheduleTimelineEvents(now, queueIndex);
             const waitTime = now + this.noteCheckInterval;
             await this.scheduleTask(() => { }, waitTime);
         }
+        if (this.timeline.length <= queueIndex) {
+            const now = this.audioContext.currentTime;
+            await this.stopNotes(0, true, now);
+            await this.audioContext.suspend();
+            finished = true;
+        }
         if (finished) {
             this.notePromises = [];
             this.resetAllStates();
@@ -619,7 +645,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);
         });
@@ -629,7 +655,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);
         });
@@ -662,7 +688,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;
@@ -688,11 +714,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;
@@ -831,31 +859,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, {
@@ -871,7 +910,13 @@ class MidyGM1 {
         }
         note.bufferSource.connect(note.filterNode);
         note.filterNode.connect(note.volumeEnvelopeNode);
-        note.bufferSource.start(startTime);
+        if (voiceParams.sample.type === "compressed") {
+            const offset = voiceParams.start / audioBuffer.sampleRate;
+            note.bufferSource.start(startTime, offset);
+        }
+        else {
+            note.bufferSource.start(startTime);
+        }
         return note;
     }
     handleExclusiveClass(note, channelNumber, startTime) {
@@ -882,14 +927,31 @@ 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 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);
         const programNumber = channel.programNumber;
         const bankTable = this.soundFontTable[programNumber];
         if (!bankTable)
@@ -899,23 +961,16 @@ class MidyGM1 {
         if (soundFontIndex === undefined)
             return;
         const soundFont = this.soundFonts[soundFontIndex];
-        const voice = soundFont.getVoice(bank, programNumber, noteNumber, velocity);
-        if (!voice)
+        note.voice = soundFont.getVoice(bank, programNumber, noteNumber, velocity);
+        if (!note.voice)
             return;
-        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) {
-            channel.sustainNotes.push(note);
+        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);
         }
-        this.handleExclusiveClass(note, channelNumber, 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);
     }
     disconnectNote(note) {
         note.bufferSource.disconnect();
@@ -928,6 +983,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);
@@ -948,7 +1004,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;
@@ -956,9 +1012,15 @@ 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);
+        const promise = this.releaseNote(channel, note, endTime);
+        this.notePromises.push(promise);
+        return promise;
     }
     setNoteIndex(channel, index) {
         let allEnds = true;
@@ -986,16 +1048,12 @@ 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 = [];
@@ -1060,11 +1118,12 @@ class MidyGM1 {
     setModLfoToPitch(channel, note, scheduleTime) {
         if (note.modulationDepth) {
             const modLfoToPitch = note.voiceParams.modLfoToPitch;
-            const baseDepth = Math.abs(modLfoToPitch) + channel.state.modulationDepth;
-            const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
+            const baseDepth = Math.abs(modLfoToPitch) +
+                channel.state.modulationDepthMSB;
+            const depth = baseDepth * Math.sign(modLfoToPitch);
             note.modulationDepth.gain
                 .cancelScheduledValues(scheduleTime)
-                .setValueAtTime(modulationDepth, scheduleTime);
+                .setValueAtTime(depth, scheduleTime);
         }
         else {
             this.startModulation(channel, note, scheduleTime);
@@ -1101,18 +1160,18 @@ class MidyGM1 {
     createVoiceParamsHandlers() {
         return {
             modLfoToPitch: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                if (0 < channel.state.modulationDepthMSB) {
                     this.setModLfoToPitch(channel, note, scheduleTime);
                 }
             },
             vibLfoToPitch: (_channel, _note, _scheduleTime) => { },
             modLfoToFilterFc: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                if (0 < channel.state.modulationDepthMSB) {
                     this.setModLfoToFilterFc(note, scheduleTime);
                 }
             },
             modLfoToVolume: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                if (0 < channel.state.modulationDepthMSB) {
                     this.setModLfoToVolume(note, scheduleTime);
                 }
             },
@@ -1124,7 +1183,7 @@ class MidyGM1 {
                 }
             },
             freqModLFO: (_channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                if (0 < channel.state.modulationDepthMSB) {
                     this.setFreqModLFO(note, scheduleTime);
                 }
             },
@@ -1199,7 +1258,8 @@ class MidyGM1 {
         }
     }
     updateModulation(channel, scheduleTime) {
-        const depth = channel.state.modulationDepth * channel.modulationDepthRange;
+        const depth = channel.state.modulationDepthMSB *
+            channel.modulationDepthRange;
         this.processScheduledNotes(channel, (note) => {
             if (note.modulationDepth) {
                 note.modulationDepth.gain.setValueAtTime(depth, scheduleTime);
@@ -1212,13 +1272,13 @@ class MidyGM1 {
     setModulationDepth(channelNumber, modulation, scheduleTime) {
         const channel = this.channels[channelNumber];
         scheduleTime ??= this.audioContext.currentTime;
-        channel.state.modulationDepth = modulation / 127;
+        channel.state.modulationDepthMSB = modulation / 127;
         this.updateModulation(channel, scheduleTime);
     }
     setVolume(channelNumber, volume, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.volume = volume / 127;
+        channel.state.volumeMSB = volume / 127;
         this.updateChannelVolume(channel, scheduleTime);
     }
     panToGain(pan) {
@@ -1231,13 +1291,13 @@ class MidyGM1 {
     setPan(channelNumber, pan, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.pan = pan / 127;
+        channel.state.panMSB = pan / 127;
         this.updateChannelVolume(channel, scheduleTime);
     }
     setExpression(channelNumber, expression, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.expression = expression / 127;
+        channel.state.expressionMSB = expression / 127;
         this.updateChannelVolume(channel, scheduleTime);
     }
     dataEntryLSB(channelNumber, value, scheduleTime) {
@@ -1246,8 +1306,8 @@ class MidyGM1 {
     }
     updateChannelVolume(channel, scheduleTime) {
         const state = channel.state;
-        const volume = state.volume * state.expression;
-        const { gainLeft, gainRight } = this.panToGain(state.pan);
+        const volume = state.volumeMSB * state.expressionMSB;
+        const { gainLeft, gainRight } = this.panToGain(state.panMSB);
         channel.gainL.gain
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(volume * gainLeft, scheduleTime);
@@ -1395,8 +1455,8 @@ class MidyGM1 {
     resetAllControllers(channelNumber, _value, scheduleTime) {
         const keys = [
             "pitchWheel",
-            "expression",
-            "modulationDepth",
+            "expressionMSB",
+            "modulationDepthMSB",
             "sustainPedal",
         ];
         const channel = this.channels[channelNumber];

package/script/midy-GM2.d.ts

@@ -44,6 +44,7 @@ export class MidyGM2 {
     soundFontTable: never[][];
     voiceCounter: Map<any, any>;
     voiceCache: Map<any, any>;
+    realtimeVoiceCache: Map<any, any>;
     isPlaying: boolean;
     isPausing: boolean;
     isPaused: boolean;
@@ -173,20 +174,19 @@ export class MidyGM2 {
     setFilterEnvelope(channel: any, note: any, scheduleTime: any): void;
     startModulation(channel: any, note: any, scheduleTime: any): void;
     startVibrato(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;
     handleDrumExclusiveClass(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): Promise<any> | undefined;
     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[];
-    releaseSostenutoPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): void[];
+    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): (Promise<any> | undefined)[];
+    releaseSostenutoPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): (Promise<any> | undefined)[];
     createMessageHandlers(): any[];
     handleMessage(data: any, scheduleTime: any): void;
     activeSensing(): void;
@@ -312,27 +312,4 @@ export class MidyGM2 {
     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;
-    vibratoLFO: any;
-    vibratoDepth: any;
-    reverbSend: any;
-    chorusSend: any;
-    portamentoNoteNumber: number;
-    noteNumber: any;
-    velocity: any;
-    startTime: any;
-    voice: any;
-    voiceParams: any;
-}
-export {};
 //# sourceMappingURL=midy-GM2.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"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"}