@marmooo/midy 0.2.3 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "A MIDI player/synthesizer written in JavaScript that supports GM-Lite/GM1 and SF2/SF3.",
   "repository": {
     "type": "git",

package/script/midy-GM1.d.ts

@@ -22,6 +22,8 @@ export class MidyGM1 {
     resumeTime: number;
     soundFonts: any[];
     soundFontTable: any[];
+    audioBufferCounter: Map<any, any>;
+    audioBufferCache: Map<any, any>;
     isPlaying: boolean;
     isPausing: boolean;
     isPaused: boolean;
@@ -30,7 +32,7 @@ export class MidyGM1 {
     timeline: any[];
     instruments: any[];
     notePromises: any[];
-    exclusiveClassMap: Map<any, any>;
+    exclusiveClassMap: SparseMap;
     audioContext: any;
     masterVolume: any;
     voiceParamsHandlers: {
@@ -71,12 +73,13 @@ export class MidyGM1 {
     };
     createChannels(audioContext: any): any[];
     createNoteBuffer(voiceParams: any, isSF3: any): Promise<any>;
-    createNoteBufferNode(voiceParams: any, isSF3: any): Promise<any>;
+    createNoteBufferNode(audioBuffer: any, voiceParams: any): any;
     scheduleTimelineEvents(t: any, offset: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
     playNotes(): Promise<any>;
     ticksToSecond(ticks: any, secondsPerBeat: any): number;
     secondToTicks(second: any, secondsPerBeat: any): number;
+    getAudioBufferId(programNumber: any, noteNumber: any, velocity: any): string;
     extractMidiData(midi: any): {
         instruments: Set<any>;
         timeline: any[];
@@ -90,19 +93,21 @@ export class MidyGM1 {
     seekTo(second: any): void;
     calcTotalTime(): number;
     currentTime(): number;
-    getActiveNotes(channel: any, time: any): Map<any, any>;
+    getActiveNotes(channel: any, time: any): SparseMap;
     getActiveNote(noteList: any, time: any): any;
     cbToRatio(cb: any): number;
     rateToCent(rate: any): number;
     centToRate(cent: any): number;
     centToHz(cent: any): number;
     calcChannelDetune(channel: any): any;
-    updateDetune(channel: any): void;
+    updateChannelDetune(channel: any): void;
+    updateDetune(channel: any, note: any): void;
     setVolumeEnvelope(note: any): void;
     setPitchEnvelope(note: any): void;
     clampCutoffFrequency(frequency: any): number;
     setFilterEnvelope(note: any): void;
     startModulation(channel: any, note: any, startTime: any): void;
+    getAudioBuffer(program: any, noteNumber: any, velocity: any, voiceParams: any, isSF3: any): Promise<any>;
     createNote(channel: any, voice: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     noteOn(channelNumber: any, noteNumber: any, velocity: any): Promise<void>;
@@ -185,6 +190,19 @@ export class MidyGM1 {
     handleSysEx(data: any): void;
     scheduleTask(callback: any, startTime: any): Promise<any>;
 }
+declare class SparseMap {
+    constructor(size: any);
+    data: any[];
+    activeIndices: any[];
+    set(key: any, value: any): void;
+    get(key: any): any;
+    delete(key: any): boolean;
+    has(key: any): boolean;
+    get size(): number;
+    clear(): void;
+    forEach(callback: any): void;
+    [Symbol.iterator](): Generator<any[], void, unknown>;
+}
 declare class Note {
     constructor(noteNumber: any, velocity: any, startTime: any, voice: any, voiceParams: any);
     bufferSource: any;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAqFA;IAoBE;;;;;;;;;;;;MAYE;IAEF,+BAQC;IAzCD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAClB,iCAA8B;IAiB5B,kBAAgC;IAChC,kBAA8C;IAC9C;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,6DA2BC;IAED,iEAUC;IAED,2EA+CC;IAED,mCAOC;IAED,0BAkDC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,+EAmBC;IAED,qDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,iCAWC;IAED,mCAgBC;IAED,kCAqBC;IAED,6CAIC;IAED,mCAuBC;IAED,+DAoBC;IAED,gHA2BC;IAED,kGAgDC;IAED,0EAGC;IAED,qFA4BC;IAED,6HAuBC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,mDASC;IAED,gDASC;IAED,gDASC;IAED,qCAMC;IAED,mCAQC;IAED,gCAOC;IAED,+BAMC;IAED;;;;;;;;;;;MA4CC;IAED,oFAMC;IAED,0DA6CC;IAED;;;;;;;;;;;;;MAeC;IAED,+EAWC;IAED,qCAeC;IAED,8DAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,wCAWC;IAED,sDAKC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,kDAKC;IAED,wDASC;IAED,8CAKC;IAED,oDAOC;IAED,gDAKC;IAED,sDAOC;IAED,+CAEC;IAED,8CAqBC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAMC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAjzCD;IAUE,0FAMC;IAfD,kBAAa;IACb,gBAAW;IACX,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAChB,gBAAW;IACX,kBAAa;IAGX,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":"AAkJA;IAsBE;;;;;;;;;;;;MAYE;IAEF,+BAQC;IA3CD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,kCAA+B;IAC/B,gCAA6B;IAC7B,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAClB,6BAAuC;IAiBrC,kBAAgC;IAChC,kBAA8C;IAC9C;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,6DA2BC;IAED,8DASC;IAED,2EA+CC;IAED,mCAOC;IAED,0BAoDC;IAED,uDAEC;IAED,wDAEC;IAED,6EAEC;IAED;;;MA4EC;IAED,+EAmBC;IAED,qDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,mDASC;IAED,6CAQC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,wCAQC;IAED,4CAKC;IAED,mCAgBC;IAED,kCAqBC;IAED,6CAIC;IAED,mCAuBC;IAED,+DAoBC;IAED,yGAgBC;IAED,gHAuCC;IAED,kGAgDC;IAED,0EAGC;IAED,qFA4BC;IAED,6HAuBC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,mDASC;IAED,gDASC;IAED,gDASC;IAED,qCAMC;IAED,mCAQC;IAED,gCAOC;IAED,+BAMC;IAED;;;;;;;;;;;MA4CC;IAED,oFAMC;IAED,0DA6CC;IAED;;;;;;;;;;;;;MAeC;IAED,+EAWC;IAED,qCAeC;IAED,8DAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,wCAWC;IAED,sDAKC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,kDAKC;IAED,wDASC;IAED,8CAKC;IAED,oDAOC;IAED,gDAKC;IAED,sDAOC;IAED,+CAEC;IAED,8CAqBC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAMC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAl6CD;IACE,uBAGC;IAFC,YAA2B;IAC3B,qBAAuB;IAGzB,gCAKC;IAED,mBAEC;IAED,0BAUC;IAED,uBAEC;IAED,mBAEC;IAED,cAMC;IASD,6BAKC;IAZD,qDAKC;CAQF;AAED;IAUE,0FAMC;IAfD,kBAAa;IACb,gBAAW;IACX,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAChB,gBAAW;IACX,kBAAa;IAGX,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}

package/script/midy-GM1.js

@@ -3,6 +3,58 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidyGM1 = void 0;
 const midi_file_1 = require("midi-file");
 const soundfont_parser_1 = require("@marmooo/soundfont-parser");
+// 2-3 times faster than Map
+class SparseMap {
+    constructor(size) {
+        this.data = new Array(size);
+        this.activeIndices = [];
+    }
+    set(key, value) {
+        if (this.data[key] === undefined) {
+            this.activeIndices.push(key);
+        }
+        this.data[key] = value;
+    }
+    get(key) {
+        return this.data[key];
+    }
+    delete(key) {
+        if (this.data[key] !== undefined) {
+            this.data[key] = undefined;
+            const index = this.activeIndices.indexOf(key);
+            if (index !== -1) {
+                this.activeIndices.splice(index, 1);
+            }
+            return true;
+        }
+        return false;
+    }
+    has(key) {
+        return this.data[key] !== undefined;
+    }
+    get size() {
+        return this.activeIndices.length;
+    }
+    clear() {
+        for (let i = 0; i < this.activeIndices.length; i++) {
+            const key = this.activeIndices[i];
+            this.data[key] = undefined;
+        }
+        this.activeIndices = [];
+    }
+    *[Symbol.iterator]() {
+        for (let i = 0; i < this.activeIndices.length; i++) {
+            const key = this.activeIndices[i];
+            yield [key, this.data[key]];
+        }
+    }
+    forEach(callback) {
+        for (let i = 0; i < this.activeIndices.length; i++) {
+            const key = this.activeIndices[i];
+            callback(this.data[key], key, this);
+        }
+    }
+}
 class Note {
     constructor(noteNumber, velocity, startTime, voice, voiceParams) {
         Object.defineProperty(this, "bufferSource", {
@@ -181,6 +233,18 @@ class MidyGM1 {
             writable: true,
             value: this.initSoundFontTable()
         });
+        Object.defineProperty(this, "audioBufferCounter", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
+        Object.defineProperty(this, "audioBufferCache", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
         Object.defineProperty(this, "isPlaying", {
             enumerable: true,
             configurable: true,
@@ -233,7 +297,7 @@ class MidyGM1 {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: new Map()
+            value: new SparseMap(128)
         });
         this.audioContext = audioContext;
         this.masterVolume = new GainNode(audioContext);
@@ -246,7 +310,7 @@ class MidyGM1 {
     initSoundFontTable() {
         const table = new Array(128);
         for (let i = 0; i < 128; i++) {
-            table[i] = new Map();
+            table[i] = new SparseMap(128);
         }
         return table;
     }
@@ -299,7 +363,7 @@ class MidyGM1 {
                 ...this.constructor.channelSettings,
                 state: new ControllerState(),
                 ...this.setChannelAudioNodes(audioContext),
-                scheduledNotes: new Map(),
+                scheduledNotes: new SparseMap(128),
             };
         });
         return channels;
@@ -333,9 +397,8 @@ class MidyGM1 {
             return audioBuffer;
         }
     }
-    async createNoteBufferNode(voiceParams, isSF3) {
+    createNoteBufferNode(audioBuffer, voiceParams) {
         const bufferSource = new AudioBufferSourceNode(this.audioContext);
-        const audioBuffer = await this.createNoteBuffer(voiceParams, isSF3);
         bufferSource.buffer = audioBuffer;
         bufferSource.loop = voiceParams.sampleModes % 2 !== 0;
         if (bufferSource.loop) {
@@ -400,6 +463,7 @@ class MidyGM1 {
                     await Promise.all(this.notePromises);
                     this.notePromises = [];
                     this.exclusiveClassMap.clear();
+                    this.audioBufferCache.clear();
                     resolve();
                     return;
                 }
@@ -415,8 +479,9 @@ class MidyGM1 {
                 }
                 else if (this.isStopping) {
                     await this.stopNotes(0, true);
-                    this.exclusiveClassMap.clear();
                     this.notePromises = [];
+                    this.exclusiveClassMap.clear();
+                    this.audioBufferCache.clear();
                     resolve();
                     this.isStopping = false;
                     this.isPaused = false;
@@ -447,6 +512,9 @@ class MidyGM1 {
     secondToTicks(second, secondsPerBeat) {
         return second * this.ticksPerBeat / secondsPerBeat;
     }
+    getAudioBufferId(programNumber, noteNumber, velocity) {
+        return `${programNumber}:${noteNumber}:${velocity}`;
+    }
     extractMidiData(midi) {
         const instruments = new Set();
         const timeline = [];
@@ -467,6 +535,8 @@ class MidyGM1 {
                 switch (event.type) {
                     case "noteOn": {
                         const channel = tmpChannels[event.channel];
+                        const audioBufferId = this.getAudioBufferId(channel.programNumber, event.noteNumber, event.velocity);
+                        this.audioBufferCounter.set(audioBufferId, (this.audioBufferCounter.get(audioBufferId) ?? 0) + 1);
                         if (channel.programNumber < 0) {
                             instruments.add(`${channel.bank}:0`);
                             channel.programNumber = 0;
@@ -483,6 +553,10 @@ class MidyGM1 {
                 timeline.push(event);
             }
         }
+        for (const [audioBufferId, count] of this.audioBufferCounter) {
+            if (count === 1)
+                this.audioBufferCounter.delete(audioBufferId);
+        }
         const priority = {
             controller: 0,
             sysEx: 1,
@@ -573,7 +647,7 @@ class MidyGM1 {
         return this.resumeTime + now - this.startTime - this.startDelay;
     }
     getActiveNotes(channel, time) {
-        const activeNotes = new Map();
+        const activeNotes = new SparseMap(128);
         channel.scheduledNotes.forEach((noteList) => {
             const activeNote = this.getActiveNote(noteList, time);
             if (activeNote) {
@@ -612,19 +686,22 @@ class MidyGM1 {
         const pitch = pitchWheel * pitchWheelSensitivity;
         return tuning + pitch;
     }
-    updateDetune(channel) {
-        const now = this.audioContext.currentTime;
+    updateChannelDetune(channel) {
         channel.scheduledNotes.forEach((noteList) => {
             for (let i = 0; i < noteList.length; i++) {
                 const note = noteList[i];
                 if (!note)
                     continue;
-                note.bufferSource.detune
-                    .cancelScheduledValues(now)
-                    .setValueAtTime(channel.detune, now);
+                this.updateDetune(channel, note);
             }
         });
     }
+    updateDetune(channel, note) {
+        const now = this.audioContext.currentTime;
+        note.bufferSource.detune
+            .cancelScheduledValues(now)
+            .setValueAtTime(channel.detune, now);
+    }
     setVolumeEnvelope(note) {
         const now = this.audioContext.currentTime;
         const { voiceParams, startTime } = note;
@@ -712,11 +789,31 @@ class MidyGM1 {
         note.modulationLFO.connect(note.volumeDepth);
         note.volumeDepth.connect(note.volumeEnvelopeNode.gain);
     }
+    async getAudioBuffer(program, noteNumber, velocity, voiceParams, isSF3) {
+        const audioBufferId = this.getAudioBufferId(program, noteNumber, velocity);
+        const cache = this.audioBufferCache.get(audioBufferId);
+        if (cache) {
+            cache.counter += 1;
+            if (cache.maxCount <= cache.counter) {
+                this.audioBufferCache.delete(audioBufferId);
+            }
+            return cache.audioBuffer;
+        }
+        else {
+            const maxCount = this.audioBufferCounter.get(audioBufferId) ?? 0;
+            const audioBuffer = await this.createNoteBuffer(voiceParams, isSF3);
+            const cache = { audioBuffer, maxCount, counter: 1 };
+            this.audioBufferCache.set(audioBufferId, cache);
+            return audioBuffer;
+        }
+    }
     async createNote(channel, voice, noteNumber, velocity, startTime, isSF3) {
         const state = channel.state;
-        const voiceParams = voice.getAllParams(state.array);
+        const controllerState = this.getControllerState(channel, noteNumber, velocity);
+        const voiceParams = voice.getAllParams(controllerState);
         const note = new Note(noteNumber, velocity, startTime, voice, voiceParams);
-        note.bufferSource = await this.createNoteBufferNode(voiceParams, isSF3);
+        const audioBuffer = await this.getAudioBuffer(channel.program, noteNumber, velocity, voiceParams, isSF3);
+        note.bufferSource = this.createNoteBufferNode(audioBuffer, voiceParams);
         note.volumeEnvelopeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
             type: "lowpass",
@@ -740,10 +837,10 @@ class MidyGM1 {
         if (soundFontIndex === undefined)
             return;
         const soundFont = this.soundFonts[soundFontIndex];
-        const isSF3 = soundFont.parsed.info.version.major === 3;
         const voice = soundFont.getVoice(bankNumber, channel.program, noteNumber, velocity);
         if (!voice)
             return;
+        const isSF3 = soundFont.parsed.info.version.major === 3;
         const note = await this.createNote(channel, voice, noteNumber, velocity, startTime, isSF3);
         note.volumeEnvelopeNode.connect(channel.gainL);
         note.volumeEnvelopeNode.connect(channel.gainR);
@@ -877,7 +974,7 @@ class MidyGM1 {
         const next = (value - 8192) / 8192;
         state.pitchWheel = value / 16383;
         channel.detune += (next - prev) * state.pitchWheelSensitivity * 12800;
-        this.updateDetune(channel);
+        this.updateChannelDetune(channel);
         this.applyVoiceParams(channel, 14);
     }
     setModLfoToPitch(channel, note) {
@@ -975,7 +1072,7 @@ class MidyGM1 {
                     const freqVibLFO = note.voiceParams.freqVibLFO;
                     note.vibratoLFO.frequency
                         .cancelScheduledValues(now)
-                        .setValueAtTime(freqVibLFO * channel.state.vibratoRate, now);
+                        .setValueAtTime(freqVibLFO * channel.state.vibratoRate * 2, now);
                 }
             },
         };
@@ -1015,7 +1112,7 @@ class MidyGM1 {
                             if (key in voiceParams)
                                 noteVoiceParams[key] = voiceParams[key];
                         }
-                        this.setFilterEnvelope(channel, note);
+                        this.setFilterEnvelope(note);
                         this.setPitchEnvelope(note);
                     }
                     else if (volumeEnvelopeKeySet.has(key)) {
@@ -1055,7 +1152,7 @@ class MidyGM1 {
         if (handler) {
             handler.call(this, channelNumber, value);
             const channel = this.channels[channelNumber];
-            this.applyVoiceParams(channel, controller + 128);
+            this.applyVoiceParams(channel, controllerType + 128);
         }
         else {
             console.warn(`Unsupported Control change: controllerType=${controllerType} value=${value}`);
@@ -1194,7 +1291,7 @@ class MidyGM1 {
         const next = value / 128;
         state.pitchWheelSensitivity = next;
         channel.detune += (state.pitchWheel * 2 - 1) * (next - prev) * 12800;
-        this.updateDetune(channel);
+        this.updateChannelDetune(channel);
         this.applyVoiceParams(channel, 16);
     }
     handleFineTuningRPN(channelNumber) {
@@ -1209,7 +1306,7 @@ class MidyGM1 {
         const next = (value - 8192) / 8.192; // cent
         channel.fineTuning = next;
         channel.detune += next - prev;
-        this.updateDetune(channel);
+        this.updateChannelDetune(channel);
     }
     handleCoarseTuningRPN(channelNumber) {
         const channel = this.channels[channelNumber];
@@ -1223,7 +1320,7 @@ class MidyGM1 {
         const next = (value - 64) * 100; // cent
         channel.coarseTuning = next;
         channel.detune += next - prev;
-        this.updateDetune(channel);
+        this.updateChannelDetune(channel);
     }
     allSoundOff(channelNumber) {
         return this.stopChannelNotes(channelNumber, 0, true);
@@ -1239,7 +1336,7 @@ class MidyGM1 {
         const state = channel.state;
         for (let i = 0; i < stateTypes.length; i++) {
             const type = stateTypes[i];
-            state[type] = defaultControllerState[type];
+            state[type] = defaultControllerState[type].defaultValue;
         }
         const settingTypes = [
             "rpnMSB",

package/script/midy-GM2.d.ts

@@ -2,8 +2,8 @@ export class MidyGM2 {
     static channelSettings: {
         currentBufferSource: null;
         detune: number;
-        scaleOctaveTuningTable: any[];
-        pressureTable: Uint8Array<ArrayBuffer>;
+        scaleOctaveTuningTable: Int8Array<ArrayBuffer>;
+        channelPressureTable: Uint8Array<ArrayBuffer>;
         keyBasedInstrumentControlTable: Int8Array<ArrayBuffer>;
         program: number;
         bank: number;
@@ -17,14 +17,6 @@ export class MidyGM2 {
         coarseTuning: number;
         modulationDepthRange: number;
     };
-    static controllerDestinationSettings: {
-        pitchControl: number;
-        filterCutoffControl: number;
-        amplitudeControl: number;
-        lfoPitchDepth: number;
-        lfoFilterDepth: number;
-        lfoAmplitudeDepth: number;
-    };
     constructor(audioContext: any, options?: {
         reverbAlgorithm: (audioContext: any) => {
             input: any;
@@ -55,6 +47,8 @@ export class MidyGM2 {
     resumeTime: number;
     soundFonts: any[];
     soundFontTable: any[];
+    audioBufferCounter: Map<any, any>;
+    audioBufferCache: Map<any, any>;
     isPlaying: boolean;
     isPausing: boolean;
     isPaused: boolean;
@@ -63,7 +57,7 @@ export class MidyGM2 {
     timeline: any[];
     instruments: any[];
     notePromises: any[];
-    exclusiveClassMap: Map<any, any>;
+    exclusiveClassMap: SparseMap;
     defaultOptions: {
         reverbAlgorithm: (audioContext: any) => {
             input: any;
@@ -141,13 +135,14 @@ export class MidyGM2 {
     };
     createChannels(audioContext: any): any[];
     createNoteBuffer(voiceParams: any, isSF3: any): Promise<any>;
-    createNoteBufferNode(voiceParams: any, isSF3: any): Promise<any>;
+    createNoteBufferNode(audioBuffer: any, voiceParams: any): any;
     findPortamentoTarget(queueIndex: any): any;
     scheduleTimelineEvents(t: any, offset: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
     playNotes(): Promise<any>;
     ticksToSecond(ticks: any, secondsPerBeat: any): number;
     secondToTicks(second: any, secondsPerBeat: any): number;
+    getAudioBufferId(programNumber: any, noteNumber: any, velocity: any): string;
     extractMidiData(midi: any): {
         instruments: Set<any>;
         timeline: any[];
@@ -161,7 +156,7 @@ export class MidyGM2 {
     seekTo(second: any): void;
     calcTotalTime(): number;
     currentTime(): number;
-    getActiveNotes(channel: any, time: any): Map<any, any>;
+    getActiveNotes(channel: any, time: any): SparseMap;
     getActiveNote(noteList: any, time: any): any;
     createConvolutionReverbImpulse(audioContext: any, decay: any, preDecay: any): any;
     createConvolutionReverb(audioContext: any, impulse: any): {
@@ -191,16 +186,18 @@ export class MidyGM2 {
     centToHz(cent: any): number;
     calcChannelDetune(channel: any): any;
     calcNoteDetune(channel: any, note: any): any;
-    updateDetune(channel: any): void;
+    updateChannelDetune(channel: any): void;
+    updateDetune(channel: any, note: any, pressure: any): void;
     getPortamentoTime(channel: any): number;
     setPortamentoStartVolumeEnvelope(channel: any, note: any): void;
-    setVolumeEnvelope(channel: any, note: any): void;
+    setVolumeEnvelope(note: any, pressure: any): void;
     setPitchEnvelope(note: any): void;
     clampCutoffFrequency(frequency: any): number;
     setPortamentoStartFilterEnvelope(channel: any, note: any): void;
-    setFilterEnvelope(channel: any, note: any): void;
+    setFilterEnvelope(channel: any, note: any, pressure: any): void;
     startModulation(channel: any, note: any, startTime: any): void;
     startVibrato(channel: any, note: any, startTime: any): void;
+    getAudioBuffer(program: any, noteNumber: any, velocity: any, voiceParams: any, isSF3: any): Promise<any>;
     createNote(channel: any, voice: any, noteNumber: any, velocity: any, startTime: any, portamento: any, isSF3: any): Promise<Note>;
     calcBank(channel: any, channelNumber: any): any;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any, portamento: any): Promise<void>;
@@ -213,17 +210,17 @@ export class MidyGM2 {
     handleMIDIMessage(statusByte: any, data1: any, data2: any): void | Promise<any>;
     handleProgramChange(channelNumber: any, program: any): void;
     handleChannelPressure(channelNumber: any, value: any): void;
-    setChannelPressure(channel: any, note: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
     setPitchBend(channelNumber: any, value: any): void;
-    setModLfoToPitch(channel: any, note: any): void;
+    setModLfoToPitch(channel: any, note: any, pressure: any): void;
     setVibLfoToPitch(channel: any, note: any): void;
-    setModLfoToFilterFc(channel: any, note: any): void;
-    setModLfoToVolume(channel: any, note: any): void;
+    setModLfoToFilterFc(note: any, pressure: any): void;
+    setModLfoToVolume(note: any, pressure: any): void;
     setReverbEffectsSend(channel: any, note: any, prevValue: any): void;
     setChorusEffectsSend(channel: any, note: any, prevValue: any): void;
     setDelayModLFO(note: any): void;
     setFreqModLFO(note: any): void;
+    setFreqVibLFO(channel: any, note: any): void;
     createVoiceParamsHandlers(): {
         modLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
         vibLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
@@ -311,7 +308,7 @@ export class MidyGM2 {
     handleUniversalNonRealTimeExclusiveMessage(data: any): void;
     GM1SystemOn(): void;
     GM2SystemOn(): void;
-    handleUniversalRealTimeExclusiveMessage(data: any): void;
+    handleUniversalRealTimeExclusiveMessage(data: any): any;
     handleMasterVolumeSysEx(data: any): void;
     setMasterVolume(volume: any): void;
     handleMasterFineTuningSysEx(data: any): void;
@@ -337,18 +334,31 @@ export class MidyGM2 {
     setChorusSendToReverb(value: any): void;
     getChorusSendToReverb(value: any): number;
     getChannelBitmap(data: any): any[];
-    handleScaleOctaveTuning1ByteFormatSysEx(data: any): void;
+    handleScaleOctaveTuning1ByteFormatSysEx(data: any, realtime: any): void;
     applyDestinationSettings(channel: any, note: any, table: any): void;
-    handleChannelPressureSysEx(data: any): void;
+    handleChannelPressureSysEx(data: any, tableName: any): void;
     initControlTable(): Uint8Array<ArrayBuffer>;
     applyControlTable(channel: any, controllerType: any): void;
     handleControlChangeSysEx(data: any): void;
     getKeyBasedInstrumentControlValue(channel: any, keyNumber: any, controllerType: any): number;
     handleKeyBasedInstrumentControlSysEx(data: any): void;
     handleExclusiveMessage(data: any): void;
-    handleSysEx(data: any): void;
+    handleSysEx(data: any): any;
     scheduleTask(callback: any, startTime: any): Promise<any>;
 }
+declare class SparseMap {
+    constructor(size: any);
+    data: any[];
+    activeIndices: any[];
+    set(key: any, value: any): void;
+    get(key: any): any;
+    delete(key: any): boolean;
+    has(key: any): boolean;
+    get size(): number;
+    clear(): void;
+    forEach(callback: any): void;
+    [Symbol.iterator](): Generator<any[], void, unknown>;
+}
 declare class Note {
     constructor(noteNumber: any, velocity: any, startTime: any, voice: any, voiceParams: any);
     bufferSource: any;

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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"}