@marmooo/midy 0.3.0 → 0.3.1

package/esm/midy-GMLite.js

@@ -446,7 +446,7 @@ export class MidyGMLite {
             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;
                     }
@@ -494,7 +494,7 @@ export class MidyGMLite {
                 if (queueIndex >= this.timeline.length) {
                     await Promise.all(this.notePromises);
                     this.notePromises = [];
-                    this.exclusiveClassNotes.flll(undefined);
+                    this.exclusiveClassNotes.fill(undefined);
                     this.audioBufferCache.clear();
                     resolve();
                     return;
@@ -613,6 +613,17 @@ export class MidyGMLite {
         }
         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 = [];
@@ -684,6 +695,8 @@ export class MidyGMLite {
                 const note = noteList[i];
                 if (!note)
                     continue;
+                if (note.ending)
+                    continue;
                 callback(note);
             }
         });
@@ -911,20 +924,21 @@ export class MidyGMLite {
         this.handleExclusiveClass(note, channelNumber, startTime);
         this.handleDrumExclusiveClass(note, channelNumber, startTime);
         const scheduledNotes = channel.scheduledNotes;
-        let notes = scheduledNotes.get(noteNumber);
-        if (notes) {
-            notes.push(note);
+        let noteList = scheduledNotes.get(noteNumber);
+        if (noteList) {
+            noteList.push(note);
         }
         else {
-            notes = [note];
-            scheduledNotes.set(noteNumber, notes);
+            noteList = [note];
+            scheduledNotes.set(noteNumber, noteList);
         }
-        if (this.isDrumNoteOffException(channel, noteNumber)) {
+        if (channel.isDrum) {
             const stopTime = startTime + note.bufferSource.buffer.duration;
-            const index = notes.length - 1;
+            const index = noteList.length - 1;
             const promise = new Promise((resolve) => {
                 note.bufferSource.onended = () => {
-                    this.disconnectNote(note, scheduledNotes, index);
+                    noteList[index] = undefined;
+                    this.disconnectNote(note);
                     resolve();
                 };
                 note.bufferSource.stop(stopTime);
@@ -936,8 +950,7 @@ export class MidyGMLite {
         scheduleTime ??= this.audioContext.currentTime;
         return this.scheduleNoteOn(channelNumber, noteNumber, velocity, scheduleTime);
     }
-    disconnectNote(note, scheduledNotes, index) {
-        scheduledNotes[index] = null;
+    disconnectNote(note) {
         note.bufferSource.disconnect();
         note.filterNode.disconnect();
         note.volumeEnvelopeNode.disconnect();
@@ -947,8 +960,8 @@ export class MidyGMLite {
             note.modulationLFO.stop();
         }
     }
-    stopNote(endTime, stopTime, scheduledNotes, index) {
-        const note = scheduledNotes[index];
+    stopNote(endTime, stopTime, noteList, index) {
+        const note = noteList[index];
         note.volumeEnvelopeNode.gain
             .cancelScheduledValues(endTime)
             .linearRampToValueAtTime(0, stopTime);
@@ -958,12 +971,23 @@ export class MidyGMLite {
         }, stopTime);
         return new Promise((resolve) => {
             note.bufferSource.onended = () => {
-                this.disconnectNote(note, scheduledNotes, index);
+                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 (channel.isDrum)
@@ -972,21 +996,20 @@ export class MidyGMLite {
             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;
@@ -1308,7 +1331,7 @@ export class MidyGMLite {
     }
     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];
@@ -1346,7 +1369,7 @@ export class MidyGMLite {
     }
     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]) {

package/esm/midy.d.ts

@@ -99,7 +99,7 @@ export class Midy {
         66: (channelNumber: any, value: any, scheduleTime: any) => void;
         67: (channelNumber: any, softPedal: any, scheduleTime: any) => void;
         71: (channelNumber: any, filterResonance: any, scheduleTime: any) => void;
-        72: (channelNumber: any, releaseTime: any, _scheduleTime: any) => void;
+        72: (channelNumber: any, releaseTime: any, scheduleTime: any) => void;
         73: (channelNumber: any, attackTime: any, scheduleTime: any) => void;
         74: (channelNumber: any, brightness: any, scheduleTime: any) => void;
         75: (channelNumber: any, dacayTime: any, scheduleTime: any) => void;
@@ -157,6 +157,7 @@ export class Midy {
         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>;
@@ -216,8 +217,9 @@ export class Midy {
     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>;
-    disconnectNote(note: any, scheduledNotes: any, index: any): 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)[];
@@ -266,7 +268,7 @@ export class Midy {
         66: (channelNumber: any, value: any, scheduleTime: any) => void;
         67: (channelNumber: any, softPedal: any, scheduleTime: any) => void;
         71: (channelNumber: any, filterResonance: any, scheduleTime: any) => void;
-        72: (channelNumber: any, releaseTime: any, _scheduleTime: any) => void;
+        72: (channelNumber: any, releaseTime: any, scheduleTime: any) => void;
         73: (channelNumber: any, attackTime: any, scheduleTime: any) => void;
         74: (channelNumber: any, brightness: any, scheduleTime: any) => void;
         75: (channelNumber: any, dacayTime: any, scheduleTime: any) => void;
@@ -309,7 +311,7 @@ export class Midy {
     setSostenutoPedal(channelNumber: any, value: any, scheduleTime: any): void;
     setSoftPedal(channelNumber: any, softPedal: any, scheduleTime: any): void;
     setFilterResonance(channelNumber: any, filterResonance: any, scheduleTime: any): void;
-    setReleaseTime(channelNumber: any, releaseTime: any, _scheduleTime: any): void;
+    setReleaseTime(channelNumber: any, releaseTime: any, scheduleTime: any): void;
     setAttackTime(channelNumber: any, attackTime: any, scheduleTime: any): void;
     setBrightness(channelNumber: any, brightness: any, scheduleTime: any): void;
     setDecayTime(channelNumber: any, dacayTime: any, scheduleTime: any): void;

package/esm/midy.d.ts.map

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

package/esm/midy.js

@@ -626,7 +626,7 @@ export class Midy {
             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, event.portamento);
                         break;
                     }
@@ -842,6 +842,17 @@ export class Midy {
         }
         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 = [];
@@ -913,6 +924,8 @@ export class Midy {
                 const note = noteList[i];
                 if (!note)
                     continue;
+                if (note.ending)
+                    continue;
                 callback(note);
             }
         });
@@ -1282,7 +1295,7 @@ export class Midy {
             type: "lowpass",
             Q: voiceParams.initialFilterQ / 5 * state.filterResonance, // dB
         });
-        if (portamento) {
+        if (0.5 <= state.portamento && portamento) {
             note.portamento = true;
             this.setPortamentoStartVolumeEnvelope(channel, note, now);
             this.setPortamentoStartFilterEnvelope(channel, note, now);
@@ -1372,8 +1385,8 @@ export class Midy {
         if (!channel.isDrum)
             return false;
         const programNumber = channel.programNumber;
-        return (programNumber === 48 && noteNumber === 88) ||
-            (programNumber === 56 && 47 <= noteNumber && noteNumber <= 84);
+        return !((programNumber === 48 && noteNumber === 88) ||
+            (programNumber === 56 && 47 <= noteNumber && noteNumber <= 84));
     }
     async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime, portamento) {
         const channel = this.channels[channelNumber];
@@ -1395,20 +1408,21 @@ export class Midy {
         this.handleExclusiveClass(note, channelNumber, startTime);
         this.handleDrumExclusiveClass(note, channelNumber, startTime);
         const scheduledNotes = channel.scheduledNotes;
-        let notes = scheduledNotes.get(noteNumber);
-        if (notes) {
-            notes.push(note);
+        let noteList = scheduledNotes.get(noteNumber);
+        if (noteList) {
+            noteList.push(note);
         }
         else {
-            notes = [note];
-            scheduledNotes.set(noteNumber, notes);
+            noteList = [note];
+            scheduledNotes.set(noteNumber, noteList);
         }
         if (this.isDrumNoteOffException(channel, noteNumber)) {
             const stopTime = startTime + note.bufferSource.buffer.duration;
-            const index = notes.length - 1;
+            const index = noteList.length - 1;
             const promise = new Promise((resolve) => {
                 note.bufferSource.onended = () => {
-                    this.disconnectNote(note, scheduledNotes, index);
+                    noteList[index] = undefined;
+                    this.disconnectNote(note);
                     resolve();
                 };
                 note.bufferSource.stop(stopTime);
@@ -1420,8 +1434,7 @@ export class Midy {
         scheduleTime ??= this.audioContext.currentTime;
         return this.scheduleNoteOn(channelNumber, noteNumber, velocity, scheduleTime, false);
     }
-    disconnectNote(note, scheduledNotes, index) {
-        scheduledNotes[index] = null;
+    disconnectNote(note) {
         note.bufferSource.disconnect();
         note.filterNode.disconnect();
         note.volumeEnvelopeNode.disconnect();
@@ -1444,8 +1457,8 @@ export class Midy {
             note.chorusEffectsSend.disconnect();
         }
     }
-    stopNote(endTime, stopTime, scheduledNotes, index) {
-        const note = scheduledNotes[index];
+    stopNote(endTime, stopTime, noteList, index) {
+        const note = noteList[index];
         note.volumeEnvelopeNode.gain
             .cancelScheduledValues(endTime)
             .linearRampToValueAtTime(0, stopTime);
@@ -1455,12 +1468,23 @@ export class Midy {
         }, stopTime);
         return new Promise((resolve) => {
             note.bufferSource.onended = () => {
-                this.disconnectNote(note, scheduledNotes, index);
+                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, portamentoNoteNumber) {
         const channel = this.channels[channelNumber];
         if (this.isDrumNoteOffException(channel, noteNumber))
@@ -1472,35 +1496,32 @@ export class Midy {
             if (channel.sostenutoNotes.has(noteNumber))
                 return;
         }
-        if (!channel.scheduledNotes.has(noteNumber))
+        const noteList = channel.scheduledNotes.get(noteNumber);
+        if (!noteList)
+            return; // be careful with drum channel
+        const noteOffTarget = this.findNoteOffTarget(noteList, endTime);
+        if (!noteOffTarget)
             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;
-            if (portamentoNoteNumber === undefined) {
-                const volRelease = endTime +
-                    note.voiceParams.volRelease * state.releaseTime * 2;
-                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);
-            }
-            else {
-                const portamentoTime = endTime + this.getPortamentoTime(channel);
-                const deltaNote = portamentoNoteNumber - noteNumber;
-                const baseRate = note.voiceParams.playbackRate;
-                const targetRate = baseRate * Math.pow(2, deltaNote / 12);
-                note.bufferSource.playbackRate
-                    .cancelScheduledValues(endTime)
-                    .linearRampToValueAtTime(targetRate, portamentoTime);
-                return this.stopNote(endTime, portamentoTime, scheduledNotes, i);
-            }
+        const [note, i] = noteOffTarget;
+        if (0.5 <= state.portamento && portamentoNoteNumber !== undefined) {
+            const portamentoTime = endTime + this.getPortamentoTime(channel);
+            const deltaNote = portamentoNoteNumber - noteNumber;
+            const baseRate = note.voiceParams.playbackRate;
+            const targetRate = baseRate * Math.pow(2, deltaNote / 12);
+            note.bufferSource.playbackRate
+                .cancelScheduledValues(endTime)
+                .linearRampToValueAtTime(targetRate, portamentoTime);
+            return this.stopNote(endTime, portamentoTime, noteList, i);
+        }
+        else {
+            const volRelease = endTime +
+                note.voiceParams.volRelease * state.releaseTime * 2;
+            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) {
@@ -1562,7 +1583,7 @@ export class Midy {
             const note = activeNotes.get(noteNumber);
             this.setControllerParameters(channel, note, table);
         }
-        // this.applyVoiceParams(channel, 10);
+        this.applyVoiceParams(channel, 10);
     }
     handleProgramChange(channelNumber, programNumber, _scheduleTime) {
         const channel = this.channels[channelNumber];
@@ -1594,7 +1615,7 @@ export class Midy {
         this.getActiveNotes(channel, scheduleTime).forEach((note) => {
             this.setControllerParameters(channel, note, table);
         });
-        // this.applyVoiceParams(channel, 13);
+        this.applyVoiceParams(channel, 13);
     }
     handlePitchBendMessage(channelNumber, lsb, msb, scheduleTime) {
         const pitchBend = msb * 128 + lsb;
@@ -1771,6 +1792,8 @@ export class Midy {
         state.set(channel.state.array);
         state[2] = velocity / 127;
         state[3] = noteNumber / 127;
+        state[10] = state.polyphonicKeyPressure / 127;
+        state[13] = state.channelPressure / 127;
         return state;
     }
     applyVoiceParams(channel, controllerType, scheduleTime) {
@@ -1797,7 +1820,7 @@ export class Midy {
                         if (key in voiceParams)
                             noteVoiceParams[key] = voiceParams[key];
                     }
-                    if (note.portamento) {
+                    if (0.5 <= channel.state.portamento && note.portamento) {
                         this.setPortamentoStartFilterEnvelope(channel, note, scheduleTime);
                     }
                     else {
@@ -2004,10 +2027,11 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
+        const state = channel.state;
         scheduleTime ??= this.audioContext.currentTime;
-        channel.state.softPedal = softPedal / 127;
+        state.softPedal = softPedal / 127;
         this.processScheduledNotes(channel, (note) => {
-            if (note.portamento) {
+            if (0.5 <= state.portamento && note.portamento) {
                 this.setPortamentoStartVolumeEnvelope(channel, note, scheduleTime);
                 this.setPortamentoStartFilterEnvelope(channel, note, scheduleTime);
             }
@@ -2029,7 +2053,7 @@ export class Midy {
             note.filterNode.Q.setValueAtTime(Q, scheduleTime);
         });
     }
-    setReleaseTime(channelNumber, releaseTime, _scheduleTime) {
+    setReleaseTime(channelNumber, releaseTime, scheduleTime) {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
@@ -2052,10 +2076,11 @@ export class Midy {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
+        const state = channel.state;
         scheduleTime ??= this.audioContext.currentTime;
-        channel.state.brightness = brightness / 64;
+        state.brightness = brightness / 64;
         this.processScheduledNotes(channel, (note) => {
-            if (note.portamento) {
+            if (0.5 <= state.portamento && note.portamento) {
                 this.setPortamentoStartFilterEnvelope(channel, note, scheduleTime);
             }
             else {
@@ -2316,7 +2341,7 @@ export class Midy {
     }
     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];
@@ -2361,7 +2386,7 @@ export class Midy {
     }
     allNotesOff(channelNumber, _value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
-        return this.stopChannelNotes(channelNumber, 0, false, scheduleTime);
+        return this.stopActiveNotes(channelNumber, 0, false, scheduleTime);
     }
     omniOff(channelNumber, value, scheduleTime) {
         this.allNotesOff(channelNumber, value, scheduleTime);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "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

@@ -87,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>;
@@ -116,8 +117,9 @@ export class MidyGM1 {
     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>;
-    disconnectNote(note: any, scheduledNotes: any, index: any): 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)[];

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;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,mGAgBC;IAED,wEAMC;IAED,uBAKC;IAED,aAMC;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,+GA0BC;IAED,gHAwCC;IAED,0EAiBC;IAED,kGAqCC;IAED,6FAQC;IAED,iEAUC;IAED,qFAgBC;IAED,yHAuBC;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;AA99CD;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"}