@marmooo/midy 0.2.9 → 0.3.1

package/script/midy-GM1.d.ts

@@ -1,9 +1,7 @@
 export class MidyGM1 {
     static channelSettings: {
-        currentBufferSource: null;
-        isDrum: boolean;
         detune: number;
-        program: number;
+        programNumber: number;
         bank: number;
         dataMSB: number;
         dataLSB: number;
@@ -15,6 +13,7 @@ export class MidyGM1 {
     };
     constructor(audioContext: any);
     mode: string;
+    numChannels: number;
     ticksPerBeat: number;
     totalTime: number;
     noteCheckInterval: number;
@@ -34,7 +33,7 @@ export class MidyGM1 {
     timeline: any[];
     instruments: any[];
     notePromises: any[];
-    exclusiveClassMap: SparseMap;
+    exclusiveClassNotes: any[];
     audioContext: any;
     masterVolume: any;
     scheduler: any;
@@ -88,6 +87,7 @@ export class MidyGM1 {
         instruments: Set<any>;
         timeline: any[];
     };
+    stopActiveNotes(channelNumber: any, velocity: any, force: any, scheduleTime: any): Promise<any[]>;
     stopChannelNotes(channelNumber: any, velocity: any, force: any, scheduleTime: any): Promise<any[]>;
     stopNotes(velocity: any, force: any, scheduleTime: any): Promise<any[]>;
     start(): Promise<void>;
@@ -112,16 +112,19 @@ export class MidyGM1 {
     clampCutoffFrequency(frequency: any): number;
     setFilterEnvelope(note: any, scheduleTime: any): void;
     startModulation(channel: any, note: any, scheduleTime: any): void;
-    getAudioBuffer(program: any, noteNumber: any, velocity: any, voiceParams: any, isSF3: any): Promise<any>;
+    getAudioBuffer(programNumber: any, noteNumber: any, velocity: any, voiceParams: any, isSF3: any): Promise<any>;
     createNote(channel: any, voice: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
+    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>;
-    stopNote(endTime: any, stopTime: any, scheduledNotes: any, index: any): Promise<any>;
+    disconnectNote(note: any): void;
+    stopNote(endTime: any, stopTime: any, noteList: any, index: any): Promise<any>;
+    findNoteOffTarget(noteList: any): any[] | undefined;
     scheduleNoteOff(channelNumber: any, noteNumber: any, _velocity: any, endTime: any, force: any): Promise<any> | undefined;
     noteOff(channelNumber: any, noteNumber: any, velocity: any, scheduleTime: any): Promise<any> | undefined;
     releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): (Promise<any> | undefined)[];
     handleMIDIMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<any>;
-    handleProgramChange(channelNumber: any, program: any, _scheduleTime: any): void;
+    handleProgramChange(channelNumber: any, programNumber: any, _scheduleTime: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any, scheduleTime: any): void;
     setPitchBend(channelNumber: any, value: any, scheduleTime: any): void;
     setModLfoToPitch(channel: any, note: any, scheduleTime: any): void;
@@ -183,6 +186,7 @@ export class MidyGM1 {
     handleCoarseTuningRPN(channelNumber: any, scheduleTime: any): void;
     setCoarseTuning(channelNumber: any, value: any, scheduleTime: any): void;
     allSoundOff(channelNumber: any, _value: any, scheduleTime: any): Promise<any[]>;
+    resetAllStates(channelNumber: any): void;
     resetAllControllers(channelNumber: any): void;
     allNotesOff(channelNumber: any, _value: any, scheduleTime: any): Promise<any[]>;
     handleUniversalNonRealTimeExclusiveMessage(data: any, scheduleTime: any): void;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAiJA;IAuBE;;;;;;;;;;;;;MAaE;IAEF,+BAcC;IAnDD,aAAa;IACb,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;IAkBrC,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAMnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAWC;IAED,6DA2BC;IAED,4DASC;IAED,2EAsDC;IAED,mCAOC;IAED,0BAoDC;IAED,uDAEC;IAED,wDAEC;IAED,6EAEC;IAED;;;MA4EC;IAED,mGAgBC;IAED,wEAMC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,yDAQC;IAED,2DASC;IAED,qDAQC;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,yGAgBC;IAED,gHAwCC;IAED,kGAkDC;IAED,6FAQC;IAED,qFAwBC;IAED,yHAuBC;IAED,yGASC;IAED,4GAeC;IAED,mGA2BC;IAED,gFAGC;IAED,wFAGC;IAED,sEAWC;IAED,mEAQC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MA2BC;IAED,oFAMC;IAED,6EA2CC;IAED;;;;;;;;;;;;;MAeC;IAED,kGAWC;IAED,wDAUC;IAED,iFAMC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAYC;IAED,kFAeC;IAED,2DAMC;IAED,uDAkBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAWC;IAED,iEAKC;IAED,uEASC;IAED,mEAKC;IAED,yEASC;IAED,gFAGC;IAED,8CAqBC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAED,6DAgBC;CACF;AA97CD;IACE,uBAGC;IAFC,YAA2B;IAC3B,qBAAuB;IAGzB,gCAKC;IAED,mBAEC;IAED,0BAUC;IAED,uBAEC;IAED,mBAEC;IAED,cAMC;IASD,6BAKC;IAZD,qDAKC;CAQF;AAED;IASE,0FAMC;IAdD,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":"AAiJA;IAwBE;;;;;;;;;;;MAWE;IAEF,+BAcC;IAlDD,aAAa;IACb,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,kCAA+B;IAC/B,gCAA6B;IAC7B,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAClB,2BAAqC;IAgBnC,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAMnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAaC;IAED,6DA2BC;IAED,4DASC;IAED,2EAsDC;IAED,mCAOC;IAED,0BAoDC;IAED,uDAEC;IAED,wDAEC;IAED,6EAEC;IAED;;;MA4EC;IAED,kGAiBC;IAED,mGAgBC;IAED,wEAMC;IAED,uBAKC;IAED,aAMC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,yDASC;IAED,2DASC;IAED,qDAQC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,+GA0BC;IAED,gHAwCC;IAED,0EAiBC;IAED,kGAsCC;IAED,6FAQC;IAED,gCASC;IAED,+EAiBC;IAED,oDAOC;IAED,yHAsBC;IAED,yGASC;IAED,4GAeC;IAED,mGA2BC;IAED,sFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAQC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MA2BC;IAED,oFAMC;IAED,6EA2CC;IAED;;;;;;;;;;;;;MAeC;IAED,kGAWC;IAED,wDAUC;IAED,iFAKC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,2DAMC;IAED,uDAkBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAKC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,yCAUC;IAGD,8CAqBC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAGD,6DAgBC;CACF;AA3/CD;IACE,uBAGC;IAFC,YAA2B;IAC3B,qBAAuB;IAGzB,gCAKC;IAED,mBAEC;IAED,0BAUC;IAED,uBAEC;IAED,mBAEC;IAED,cAMC;IASD,6BAKC;IAZD,qDAKC;CAQF;AAED;IASE,0FAMC;IAdD,kBAAa;IACb,gBAAW;IACX,iBAAY;IACZ,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}

package/script/midy-GM1.js

@@ -179,6 +179,12 @@ class MidyGM1 {
             writable: true,
             value: "GM1"
         });
+        Object.defineProperty(this, "numChannels", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 16
+        });
         Object.defineProperty(this, "ticksPerBeat", {
             enumerable: true,
             configurable: true,
@@ -293,11 +299,11 @@ class MidyGM1 {
             writable: true,
             value: []
         });
-        Object.defineProperty(this, "exclusiveClassMap", {
+        Object.defineProperty(this, "exclusiveClassNotes", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: new SparseMap(128)
+            value: new Array(128)
         });
         this.audioContext = audioContext;
         this.masterVolume = new GainNode(audioContext);
@@ -364,8 +370,10 @@ class MidyGM1 {
         };
     }
     createChannels(audioContext) {
-        const channels = Array.from({ length: 16 }, () => {
+        const channels = Array.from({ length: this.numChannels }, () => {
             return {
+                currentBufferSource: null,
+                isDrum: false,
                 ...this.constructor.channelSettings,
                 state: new ControllerState(),
                 ...this.setChannelAudioNodes(audioContext),
@@ -422,7 +430,7 @@ class MidyGM1 {
             const startTime = event.startTime + this.startDelay - offset;
             switch (event.type) {
                 case "noteOn":
-                    if (event.velocity !== 0) {
+                    if (0 < event.velocity) {
                         await this.scheduleNoteOn(event.channel, event.noteNumber, event.velocity, startTime);
                         break;
                     }
@@ -470,7 +478,7 @@ class MidyGM1 {
                 if (queueIndex >= this.timeline.length) {
                     await Promise.all(this.notePromises);
                     this.notePromises = [];
-                    this.exclusiveClassMap.clear();
+                    this.exclusiveClassNotes.fill(undefined);
                     this.audioBufferCache.clear();
                     resolve();
                     return;
@@ -489,7 +497,7 @@ class MidyGM1 {
                 else if (this.isStopping) {
                     await this.stopNotes(0, true, now);
                     this.notePromises = [];
-                    this.exclusiveClassMap.clear();
+                    this.exclusiveClassNotes.fill(undefined);
                     this.audioBufferCache.clear();
                     resolve();
                     this.isStopping = false;
@@ -498,7 +506,7 @@ class MidyGM1 {
                 }
                 else if (this.isSeeking) {
                     this.stopNotes(0, true, now);
-                    this.exclusiveClassMap.clear();
+                    this.exclusiveClassNotes.fill(undefined);
                     this.startTime = this.audioContext.currentTime;
                     queueIndex = this.getQueueIndex(this.resumeTime);
                     offset = this.resumeTime - this.startTime;
@@ -526,7 +534,7 @@ class MidyGM1 {
     extractMidiData(midi) {
         const instruments = new Set();
         const timeline = [];
-        const tmpChannels = new Array(16);
+        const tmpChannels = new Array(this.channels.length);
         for (let i = 0; i < tmpChannels.length; i++) {
             tmpChannels[i] = {
                 programNumber: -1,
@@ -589,6 +597,17 @@ class MidyGM1 {
         }
         return { instruments, timeline };
     }
+    stopActiveNotes(channelNumber, velocity, force, scheduleTime) {
+        const channel = this.channels[channelNumber];
+        const promises = [];
+        const activeNotes = this.getActiveNotes(channel, scheduleTime);
+        activeNotes.forEach((note) => {
+            const promise = this.scheduleNoteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force, undefined);
+            this.notePromises.push(promise);
+            promises.push(promise);
+        });
+        return Promise.all(promises);
+    }
     stopChannelNotes(channelNumber, velocity, force, scheduleTime) {
         const channel = this.channels[channelNumber];
         const promises = [];
@@ -618,6 +637,9 @@ class MidyGM1 {
         if (!this.isPlaying)
             return;
         this.isStopping = true;
+        for (let i = 0; i < this.channels.length; i++) {
+            this.resetAllStates(i);
+        }
     }
     pause() {
         if (!this.isPlaying || this.isPaused)
@@ -657,6 +679,8 @@ class MidyGM1 {
                 const note = noteList[i];
                 if (!note)
                     continue;
+                if (note.ending)
+                    continue;
                 callback(note);
             }
         });
@@ -795,8 +819,8 @@ 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);
+    async getAudioBuffer(programNumber, noteNumber, velocity, voiceParams, isSF3) {
+        const audioBufferId = this.getAudioBufferId(programNumber, noteNumber, velocity);
         const cache = this.audioBufferCache.get(audioBufferId);
         if (cache) {
             cache.counter += 1;
@@ -819,7 +843,7 @@ class MidyGM1 {
         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.program, noteNumber, velocity, voiceParams, isSF3);
+        const audioBuffer = await this.getAudioBuffer(channel.programNumber, noteNumber, velocity, voiceParams, isSF3);
         note.bufferSource = this.createBufferSource(audioBuffer, voiceParams);
         note.volumeEnvelopeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
@@ -837,14 +861,28 @@ class MidyGM1 {
         note.bufferSource.start(startTime);
         return note;
     }
+    handleExclusiveClass(note, channelNumber, startTime) {
+        const exclusiveClass = note.voiceParams.exclusiveClass;
+        if (exclusiveClass === 0)
+            return;
+        const prev = this.exclusiveClassNotes[exclusiveClass];
+        if (prev) {
+            const [prevNote, prevChannelNumber] = prev;
+            if (prevNote && !prevNote.ending) {
+                this.scheduleNoteOff(prevChannelNumber, prevNote.noteNumber, 0, // velocity,
+                startTime, true);
+            }
+        }
+        this.exclusiveClassNotes[exclusiveClass] = [note, channelNumber];
+    }
     async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime) {
         const channel = this.channels[channelNumber];
         const bankNumber = channel.bank;
-        const soundFontIndex = this.soundFontTable[channel.program].get(bankNumber);
+        const soundFontIndex = this.soundFontTable[channel.programNumber].get(bankNumber);
         if (soundFontIndex === undefined)
             return;
         const soundFont = this.soundFonts[soundFontIndex];
-        const voice = soundFont.getVoice(bankNumber, channel.program, noteNumber, velocity);
+        const voice = soundFont.getVoice(bankNumber, channel.programNumber, noteNumber, velocity);
         if (!voice)
             return;
         const isSF3 = soundFont.parsed.info.version.major === 3;
@@ -854,32 +892,33 @@ class MidyGM1 {
         if (0.5 <= channel.state.sustainPedal) {
             channel.sustainNotes.push(note);
         }
-        const exclusiveClass = note.voiceParams.exclusiveClass;
-        if (exclusiveClass !== 0) {
-            if (this.exclusiveClassMap.has(exclusiveClass)) {
-                const prevEntry = this.exclusiveClassMap.get(exclusiveClass);
-                const [prevNote, prevChannelNumber] = prevEntry;
-                if (prevNote && !prevNote.ending) {
-                    this.scheduleNoteOff(prevChannelNumber, prevNote.noteNumber, 0, // velocity,
-                    startTime, true);
-                }
-            }
-            this.exclusiveClassMap.set(exclusiveClass, [note, channelNumber]);
-        }
+        this.handleExclusiveClass(note, channelNumber, startTime);
         const scheduledNotes = channel.scheduledNotes;
-        if (scheduledNotes.has(noteNumber)) {
-            scheduledNotes.get(noteNumber).push(note);
+        let noteList = scheduledNotes.get(noteNumber);
+        if (noteList) {
+            noteList.push(note);
         }
         else {
-            scheduledNotes.set(noteNumber, [note]);
+            noteList = [note];
+            scheduledNotes.set(noteNumber, noteList);
         }
     }
     noteOn(channelNumber, noteNumber, velocity, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
         return this.scheduleNoteOn(channelNumber, noteNumber, velocity, scheduleTime);
     }
-    stopNote(endTime, stopTime, scheduledNotes, index) {
-        const note = scheduledNotes[index];
+    disconnectNote(note) {
+        note.bufferSource.disconnect();
+        note.filterNode.disconnect();
+        note.volumeEnvelopeNode.disconnect();
+        if (note.modulationDepth) {
+            note.volumeDepth.disconnect();
+            note.modulationDepth.disconnect();
+            note.modulationLFO.stop();
+        }
+    }
+    stopNote(endTime, stopTime, noteList, index) {
+        const note = noteList[index];
         note.volumeEnvelopeNode.gain
             .cancelScheduledValues(endTime)
             .linearRampToValueAtTime(0, stopTime);
@@ -889,41 +928,43 @@ class MidyGM1 {
         }, stopTime);
         return new Promise((resolve) => {
             note.bufferSource.onended = () => {
-                scheduledNotes[index] = null;
-                note.bufferSource.disconnect();
-                note.filterNode.disconnect();
-                note.volumeEnvelopeNode.disconnect();
-                if (note.modulationDepth) {
-                    note.volumeDepth.disconnect();
-                    note.modulationDepth.disconnect();
-                    note.modulationLFO.stop();
-                }
+                noteList[index] = undefined;
+                this.disconnectNote(note);
                 resolve();
             };
             note.bufferSource.stop(stopTime);
         });
     }
+    findNoteOffTarget(noteList) {
+        for (let i = 0; i < noteList.length; i++) {
+            const note = noteList[i];
+            if (!note)
+                continue;
+            if (note.ending)
+                continue;
+            return [note, i];
+        }
+    }
     scheduleNoteOff(channelNumber, noteNumber, _velocity, endTime, force) {
         const channel = this.channels[channelNumber];
         if (!force && 0.5 <= channel.state.sustainPedal)
             return;
         if (!channel.scheduledNotes.has(noteNumber))
             return;
-        const scheduledNotes = channel.scheduledNotes.get(noteNumber);
-        for (let i = 0; i < scheduledNotes.length; i++) {
-            const note = scheduledNotes[i];
-            if (!note)
-                continue;
-            if (note.ending)
-                continue;
-            const volRelease = endTime + note.voiceParams.volRelease;
-            const modRelease = endTime + note.voiceParams.modRelease;
-            note.filterNode.frequency
-                .cancelScheduledValues(endTime)
-                .linearRampToValueAtTime(0, modRelease);
-            const stopTime = Math.min(volRelease, modRelease);
-            return this.stopNote(endTime, stopTime, scheduledNotes, i);
-        }
+        const noteList = channel.scheduledNotes.get(noteNumber);
+        if (!noteList)
+            return; // be careful with drum channel
+        const noteOffTarget = this.findNoteOffTarget(noteList, endTime);
+        if (!noteOffTarget)
+            return;
+        const [note, i] = noteOffTarget;
+        const volRelease = endTime + note.voiceParams.volRelease;
+        const modRelease = endTime + note.voiceParams.modRelease;
+        note.filterNode.frequency
+            .cancelScheduledValues(endTime)
+            .linearRampToValueAtTime(0, modRelease);
+        const stopTime = Math.min(volRelease, modRelease);
+        return this.stopNote(endTime, stopTime, noteList, i);
     }
     noteOff(channelNumber, noteNumber, velocity, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
@@ -958,9 +999,9 @@ class MidyGM1 {
                 console.warn(`Unsupported MIDI message: ${messageType.toString(16)}`);
         }
     }
-    handleProgramChange(channelNumber, program, _scheduleTime) {
+    handleProgramChange(channelNumber, programNumber, _scheduleTime) {
         const channel = this.channels[channelNumber];
-        channel.program = program;
+        channel.programNumber = programNumber;
     }
     handlePitchBendMessage(channelNumber, lsb, msb, scheduleTime) {
         const pitchBend = msb * 128 + lsb;
@@ -968,8 +1009,6 @@ class MidyGM1 {
     }
     setPitchBend(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
-        if (channel.isDrum)
-            return;
         scheduleTime ??= this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheel * 2 - 1;
@@ -1132,8 +1171,6 @@ class MidyGM1 {
     }
     setModulationDepth(channelNumber, modulation, scheduleTime) {
         const channel = this.channels[channelNumber];
-        if (channel.isDrum)
-            return;
         scheduleTime ??= this.audioContext.currentTime;
         channel.state.modulationDepth = modulation / 127;
         this.updateModulation(channel, scheduleTime);
@@ -1180,8 +1217,6 @@ class MidyGM1 {
     }
     setSustainPedal(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
-        if (channel.isDrum)
-            return;
         scheduleTime ??= this.audioContext.currentTime;
         channel.state.sustainPedal = value / 127;
         if (64 <= value) {
@@ -1254,8 +1289,6 @@ class MidyGM1 {
     }
     setPitchBendRange(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
-        if (channel.isDrum)
-            return;
         scheduleTime ??= this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheelSensitivity;
@@ -1273,8 +1306,6 @@ class MidyGM1 {
     }
     setFineTuning(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
-        if (channel.isDrum)
-            return;
         scheduleTime ??= this.audioContext.currentTime;
         const prev = channel.fineTuning;
         const next = (value - 8192) / 8.192; // cent
@@ -1290,8 +1321,6 @@ class MidyGM1 {
     }
     setCoarseTuning(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
-        if (channel.isDrum)
-            return;
         scheduleTime ??= this.audioContext.currentTime;
         const prev = channel.coarseTuning;
         const next = (value - 64) * 100; // cent
@@ -1301,14 +1330,26 @@ class MidyGM1 {
     }
     allSoundOff(channelNumber, _value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
-        return this.stopChannelNotes(channelNumber, 0, true, scheduleTime);
+        return this.stopActiveNotes(channelNumber, 0, true, scheduleTime);
+    }
+    resetAllStates(channelNumber) {
+        const channel = this.channels[channelNumber];
+        const state = channel.state;
+        for (const type of Object.keys(defaultControllerState)) {
+            state[type] = defaultControllerState[type].defaultValue;
+        }
+        for (const type of Object.keys(this.constructor.channelSettings)) {
+            channel[type] = this.constructor.channelSettings[type];
+        }
+        this.mode = "GM1";
     }
+    // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp15.pdf
     resetAllControllers(channelNumber) {
         const stateTypes = [
+            "pitchWheel",
             "expression",
             "modulationDepth",
             "sustainPedal",
-            "pitchWheelSensitivity",
         ];
         const channel = this.channels[channelNumber];
         const state = channel.state;
@@ -1327,7 +1368,7 @@ class MidyGM1 {
     }
     allNotesOff(channelNumber, _value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
-        return this.stopChannelNotes(channelNumber, 0, false, scheduleTime);
+        return this.stopActiveNotes(channelNumber, 0, false, scheduleTime);
     }
     handleUniversalNonRealTimeExclusiveMessage(data, scheduleTime) {
         switch (data[2]) {
@@ -1397,6 +1438,7 @@ class MidyGM1 {
                 console.warn(`Unsupported Exclusive Message: ${data}`);
         }
     }
+    // https://github.com/marmooo/js-timer-benchmark
     scheduleTask(callback, scheduleTime) {
         return new Promise((resolve) => {
             const bufferSource = new AudioBufferSourceNode(this.audioContext, {
@@ -1422,10 +1464,8 @@ Object.defineProperty(MidyGM1, "channelSettings", {
     configurable: true,
     writable: true,
     value: {
-        currentBufferSource: null,
-        isDrum: false,
         detune: 0,
-        program: 0,
+        programNumber: 0,
         bank: 0,
         dataMSB: 0,
         dataLSB: 0,

package/script/midy-GM2.d.ts

@@ -1,9 +1,7 @@
 export class MidyGM2 {
     static channelSettings: {
-        currentBufferSource: null;
-        isDrum: boolean;
         detune: number;
-        program: number;
+        programNumber: number;
         bank: number;
         bankMSB: number;
         bankLSB: number;
@@ -23,8 +21,6 @@ export class MidyGM2 {
         };
     });
     mode: string;
-    ticksPerBeat: number;
-    totalTime: number;
     masterFineTuning: number;
     masterCoarseTuning: number;
     reverb: {
@@ -38,6 +34,9 @@ export class MidyGM2 {
         sendToReverb: number;
         delayTimes: any[];
     };
+    numChannels: number;
+    ticksPerBeat: number;
+    totalTime: number;
     noteCheckInterval: number;
     lookAhead: number;
     startDelay: number;
@@ -55,7 +54,8 @@ export class MidyGM2 {
     timeline: any[];
     instruments: any[];
     notePromises: any[];
-    exclusiveClassMap: SparseMap;
+    exclusiveClassNotes: any[];
+    drumExclusiveClassNotes: any[];
     defaultOptions: {
         reverbAlgorithm: (audioContext: any) => {
             input: any;
@@ -135,8 +135,7 @@ export class MidyGM2 {
     };
     createChannels(audioContext: any): any[];
     createNoteBuffer(voiceParams: any, isSF3: any): Promise<any>;
-    calcLoopMode(channel: any, note: any, voiceParams: any): boolean;
-    createBufferSource(channel: any, note: any, voiceParams: any, audioBuffer: any): any;
+    createBufferSource(voiceParams: any, audioBuffer: any): any;
     findPortamentoTarget(queueIndex: any): any;
     scheduleTimelineEvents(t: any, offset: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
@@ -148,6 +147,7 @@ export class MidyGM2 {
         instruments: Set<any>;
         timeline: any[];
     };
+    stopActiveNotes(channelNumber: any, velocity: any, force: any, scheduleTime: any): Promise<any[]>;
     stopChannelNotes(channelNumber: any, velocity: any, force: any, scheduleTime: any): Promise<any[]>;
     stopNotes(velocity: any, force: any, scheduleTime: any): Promise<any[]>;
     start(): Promise<void>;
@@ -199,18 +199,23 @@ 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(program: any, noteNumber: any, velocity: any, voiceParams: any, isSF3: any): Promise<any>;
+    getAudioBuffer(programNumber: 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): any;
+    handleExclusiveClass(note: any, channelNumber: any, startTime: any): void;
+    handleDrumExclusiveClass(note: any, channelNumber: any, startTime: any): void;
+    isDrumNoteOffException(channel: any, noteNumber: any): boolean;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any, portamento: any): Promise<void>;
     noteOn(channelNumber: any, noteNumber: any, velocity: any, scheduleTime: any): Promise<void>;
-    stopNote(endTime: any, stopTime: any, scheduledNotes: any, index: any): Promise<any>;
+    disconnectNote(note: any): void;
+    stopNote(endTime: any, stopTime: any, noteList: any, index: any): Promise<any>;
+    findNoteOffTarget(noteList: any): any[] | undefined;
     scheduleNoteOff(channelNumber: any, noteNumber: any, _velocity: any, endTime: any, force: any, portamentoNoteNumber: any): Promise<any> | undefined;
     noteOff(channelNumber: any, noteNumber: any, velocity: any, scheduleTime: any): Promise<any> | undefined;
     releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): (Promise<any> | undefined)[];
     releaseSostenutoPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): any[];
     handleMIDIMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<any>;
-    handleProgramChange(channelNumber: any, program: any, _scheduleTime: any): void;
+    handleProgramChange(channelNumber: any, programNumber: any, _scheduleTime: any): void;
     handleChannelPressure(channelNumber: any, value: any, scheduleTime: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any, scheduleTime: any): void;
     setPitchBend(channelNumber: any, value: any, scheduleTime: any): void;
@@ -301,6 +306,7 @@ export class MidyGM2 {
     handleModulationDepthRangeRPN(channelNumber: any, scheduleTime: any): void;
     setModulationDepthRange(channelNumber: any, modulationDepthRange: any, scheduleTime: any): void;
     allSoundOff(channelNumber: any, _value: any, scheduleTime: any): Promise<any[]>;
+    resetAllStates(channelNumber: any): void;
     resetAllControllers(channelNumber: any): void;
     allNotesOff(channelNumber: any, _value: any, scheduleTime: any): Promise<any[]>;
     omniOff(channelNumber: any, value: any, scheduleTime: any): void;

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