@marmooo/midy 0.4.1 → 0.4.2

package/script/midy-GM1.d.ts

@@ -1,4 +1,4 @@
-export class MidyGM1 {
+export class MidyGM1 extends EventTarget {
     static channelSettings: {
         scheduleIndex: number;
         detune: number;
@@ -31,6 +31,7 @@ export class MidyGM1 {
     isPaused: boolean;
     isStopping: boolean;
     isSeeking: boolean;
+    loop: boolean;
     playPromise: any;
     timeline: any[];
     notePromises: any[];
@@ -69,7 +70,7 @@ export class MidyGM1 {
     createChannels(audioContext: any): any[];
     createAudioBuffer(voiceParams: any): Promise<any>;
     createBufferSource(voiceParams: any, audioBuffer: any): any;
-    scheduleTimelineEvents(scheduleTime: any, queueIndex: any): Promise<any>;
+    scheduleTimelineEvents(scheduleTime: any, queueIndex: any): any;
     getQueueIndex(second: any): number;
     resetAllStates(): void;
     updateStates(queueIndex: any, nextQueueIndex: any): void;
@@ -91,8 +92,8 @@ export class MidyGM1 {
     seekTo(second: any): void;
     calcTotalTime(): number;
     currentTime(): number;
-    processScheduledNotes(channel: any, callback: any): void;
-    processActiveNotes(channel: any, scheduleTime: any, callback: any): void;
+    processScheduledNotes(channel: any, callback: any): Promise<void>;
+    processActiveNotes(channel: any, scheduleTime: any, callback: any): Promise<void>;
     cbToRatio(cb: any): number;
     rateToCent(rate: any): number;
     centToRate(cent: any): number;
@@ -112,13 +113,13 @@ export class MidyGM1 {
     noteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     disconnectNote(note: any): void;
     releaseNote(channel: any, note: any, endTime: any): Promise<any>;
-    noteOff(channelNumber: any, noteNumber: any, velocity: any, endTime: any, force: any): Promise<any> | undefined;
+    noteOff(channelNumber: any, noteNumber: any, _velocity: any, endTime: any, force: any): any;
     setNoteIndex(channel: any, index: any): void;
     findNoteOffIndex(channel: any, noteNumber: any): any;
-    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): (Promise<any> | undefined)[];
+    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): any[];
     createMessageHandlers(): any[];
     handleMessage(data: any, scheduleTime: any): void;
-    handleChannelMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<any>;
+    handleChannelMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): 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;

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AA+FA;IA2BE;;;;;;;;;;;MAWE;IAEF,+BAgBC;IAvDD,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,cAAa;IACb,iBAAY;IACZ,gBAAc;IACd,oBAAkB;IAClB,sBAAwB;IACxB,2BAAqC;IAiBnC,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,gEAoDC;IAED,mCAOC;IAED,uBASC;IAED,yDAgCC;IAED,2BAyEC;IAED,uDAEC;IAED,wDAEC;IAED,qCAKC;IAED;;;MAwDC;IAED,kGAeC;IAED,mGAeC;IAED,wEAMC;IAED,uBAMC;IAED,sBAIC;IAED,uBAMC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAIC;IAED,kEAWC;IAED,kFAYC;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,0FAoBC;IAED,gCASC;IAED,iEAqBC;IAED,4FAmBC;IAED,6CAUC;IAED,qDAUC;IAED,qFAeC;IAED,+BAmBC;IAED,kDAOC;IAED,sFA2BC;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

@@ -29,12 +29,6 @@ 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,
@@ -80,6 +74,9 @@ class Note {
         this.noteNumber = noteNumber;
         this.velocity = velocity;
         this.startTime = startTime;
+        this.ready = new Promise((resolve) => {
+            this.resolveReady = resolve;
+        });
     }
 }
 // normalized to 0-1 for use with the SF2 modulator model
@@ -153,8 +150,9 @@ const pitchEnvelopeKeys = [
     "playbackRate",
 ];
 const pitchEnvelopeKeySet = new Set(pitchEnvelopeKeys);
-class MidyGM1 {
+class MidyGM1 extends EventTarget {
     constructor(audioContext) {
+        super();
         Object.defineProperty(this, "mode", {
             enumerable: true,
             configurable: true,
@@ -269,6 +267,12 @@ class MidyGM1 {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "loop", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         Object.defineProperty(this, "playPromise", {
             enumerable: true,
             configurable: true,
@@ -456,7 +460,7 @@ class MidyGM1 {
         }
         return bufferSource;
     }
-    async scheduleTimelineEvents(scheduleTime, queueIndex) {
+    scheduleTimelineEvents(scheduleTime, queueIndex) {
         const timeOffset = this.resumeTime - this.startTime;
         const lookAheadCheckTime = scheduleTime + timeOffset + this.lookAhead;
         const schedulingOffset = this.startDelay - timeOffset;
@@ -468,7 +472,7 @@ class MidyGM1 {
             const startTime = event.startTime + schedulingOffset;
             switch (event.type) {
                 case "noteOn":
-                    await this.noteOn(event.channel, event.noteNumber, event.velocity, startTime);
+                    this.noteOn(event.channel, event.noteNumber, event.velocity, startTime);
                     break;
                 case "noteOff": {
                     this.noteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
@@ -509,22 +513,23 @@ class MidyGM1 {
         }
     }
     updateStates(queueIndex, nextQueueIndex) {
+        const now = this.audioContext.currentTime;
         if (nextQueueIndex < queueIndex)
             queueIndex = 0;
         for (let i = queueIndex; i < nextQueueIndex; i++) {
             const event = this.timeline[i];
             switch (event.type) {
                 case "controller":
-                    this.setControlChange(event.channel, event.controllerType, event.value, 0);
+                    this.setControlChange(event.channel, event.controllerType, event.value, now - this.resumeTime + event.startTime);
                     break;
                 case "programChange":
-                    this.setProgramChange(event.channel, event.programNumber, 0);
+                    this.setProgramChange(event.channel, event.programNumber, now - this.resumeTime + event.startTime);
                     break;
                 case "pitchBend":
-                    this.setPitchBend(event.channel, event.value + 8192, 0);
+                    this.setPitchBend(event.channel, event.value + 8192, now - this.resumeTime + event.startTime);
                     break;
                 case "sysEx":
-                    this.handleSysEx(event.data, 0);
+                    this.handleSysEx(event.data, now - this.resumeTime + event.startTime);
             }
         }
     }
@@ -532,50 +537,80 @@ class MidyGM1 {
         if (this.audioContext.state === "suspended") {
             await this.audioContext.resume();
         }
+        const paused = this.isPaused;
         this.isPlaying = true;
         this.isPaused = false;
         this.startTime = this.audioContext.currentTime;
+        if (paused) {
+            this.dispatchEvent(new Event("resumed"));
+        }
+        else {
+            this.dispatchEvent(new Event("started"));
+        }
         let queueIndex = this.getQueueIndex(this.resumeTime);
-        let finished = false;
+        let exitReason;
         this.notePromises = [];
-        while (queueIndex < this.timeline.length) {
+        while (true) {
             const now = this.audioContext.currentTime;
+            if (this.timeline.length <= queueIndex) {
+                await this.stopNotes(0, true, now);
+                if (this.loop) {
+                    this.notePromises = [];
+                    this.resetAllStates();
+                    this.startTime = this.audioContext.currentTime;
+                    this.resumeTime = 0;
+                    queueIndex = 0;
+                    this.dispatchEvent(new Event("looped"));
+                    continue;
+                }
+                else {
+                    await this.audioContext.suspend();
+                    exitReason = "ended";
+                    break;
+                }
+            }
             if (this.isPausing) {
                 await this.stopNotes(0, true, now);
                 await this.audioContext.suspend();
                 this.notePromises = [];
+                this.isPausing = false;
+                exitReason = "paused";
                 break;
             }
             else if (this.isStopping) {
                 await this.stopNotes(0, true, now);
                 await this.audioContext.suspend();
-                finished = true;
+                this.isStopping = false;
+                exitReason = "stopped";
                 break;
             }
             else if (this.isSeeking) {
-                await this.stopNotes(0, true, now);
+                this.stopNotes(0, true, now);
                 this.startTime = this.audioContext.currentTime;
                 const nextQueueIndex = this.getQueueIndex(this.resumeTime);
                 this.updateStates(queueIndex, nextQueueIndex);
                 queueIndex = nextQueueIndex;
                 this.isSeeking = false;
+                this.dispatchEvent(new Event("seeked"));
                 continue;
             }
-            queueIndex = await this.scheduleTimelineEvents(now, queueIndex);
+            queueIndex = 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) {
+        if (exitReason !== "paused") {
             this.notePromises = [];
             this.resetAllStates();
         }
         this.isPlaying = false;
+        if (exitReason === "paused") {
+            this.isPaused = true;
+            this.dispatchEvent(new Event("paused"));
+        }
+        else {
+            this.isPaused = false;
+            this.dispatchEvent(new Event(exitReason));
+        }
     }
     ticksToSecond(ticks, secondsPerBeat) {
         return ticks * secondsPerBeat / this.ticksPerBeat;
@@ -682,24 +717,20 @@ class MidyGM1 {
             return;
         this.isStopping = true;
         await this.playPromise;
-        this.isStopping = false;
     }
     async pause() {
         if (!this.isPlaying || this.isPaused)
             return;
         const now = this.audioContext.currentTime;
-        this.resumeTime = now - this.startTime - this.startDelay;
+        this.resumeTime = now + this.resumeTime - this.startTime;
         this.isPausing = true;
         await this.playPromise;
-        this.isPausing = false;
-        this.isPaused = true;
     }
     async resume() {
         if (!this.isPaused)
             return;
         this.playPromise = this.playNotes();
         await this.playPromise;
-        this.isPaused = false;
     }
     seekTo(second) {
         this.resumeTime = second;
@@ -722,19 +753,23 @@ class MidyGM1 {
         const now = this.audioContext.currentTime;
         return now + this.resumeTime - this.startTime;
     }
-    processScheduledNotes(channel, callback) {
+    async processScheduledNotes(channel, callback) {
         const scheduledNotes = channel.scheduledNotes;
+        const tasks = [];
         for (let i = channel.scheduleIndex; i < scheduledNotes.length; i++) {
             const note = scheduledNotes[i];
             if (!note)
                 continue;
             if (note.ending)
                 continue;
-            callback(note);
+            const task = note.ready.then(() => callback(note));
+            tasks.push(task);
         }
+        await Promise.all(tasks);
     }
-    processActiveNotes(channel, scheduleTime, callback) {
+    async processActiveNotes(channel, scheduleTime, callback) {
         const scheduledNotes = channel.scheduledNotes;
+        const tasks = [];
         for (let i = channel.scheduleIndex; i < scheduledNotes.length; i++) {
             const note = scheduledNotes[i];
             if (!note)
@@ -743,8 +778,10 @@ class MidyGM1 {
                 continue;
             if (scheduleTime < note.startTime)
                 break;
-            callback(note);
+            const task = note.ready.then(() => callback(note));
+            tasks.push(task);
         }
+        await Promise.all(tasks);
     }
     cbToRatio(cb) {
         return Math.pow(10, cb / 200);
@@ -966,11 +1003,7 @@ class MidyGM1 {
             return;
         await this.setNoteAudioNode(channel, note, realtime);
         this.setNoteRouting(channelNumber, note, startTime);
-        note.pending = false;
-        const off = note.offEvent;
-        if (off) {
-            this.noteOff(channelNumber, noteNumber, off.velocity, off.startTime);
-        }
+        note.resolveReady();
     }
     disconnectNote(note) {
         note.bufferSource.disconnect();
@@ -1004,7 +1037,7 @@ class MidyGM1 {
             }, stopTime);
         });
     }
-    noteOff(channelNumber, noteNumber, velocity, endTime, force) {
+    noteOff(channelNumber, noteNumber, _velocity, endTime, force) {
         const channel = this.channels[channelNumber];
         if (!force && 0.5 <= channel.state.sustainPedal)
             return;
@@ -1012,13 +1045,11 @@ 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);
-        const promise = this.releaseNote(channel, note, endTime);
+        const promise = note.ready.then(() => {
+            return this.releaseNote(channel, note, endTime);
+        });
         this.notePromises.push(promise);
         return promise;
     }
@@ -1106,7 +1137,8 @@ class MidyGM1 {
     }
     setPitchBend(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheel * 2 - 1;
         const next = (value - 8192) / 8192;
@@ -1271,12 +1303,14 @@ class MidyGM1 {
     }
     setModulationDepth(channelNumber, modulation, scheduleTime) {
         const channel = this.channels[channelNumber];
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         channel.state.modulationDepthMSB = modulation / 127;
         this.updateModulation(channel, scheduleTime);
     }
     setVolume(channelNumber, volume, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.state.volumeMSB = volume / 127;
         this.updateChannelVolume(channel, scheduleTime);
@@ -1289,13 +1323,15 @@ class MidyGM1 {
         };
     }
     setPan(channelNumber, pan, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.state.panMSB = pan / 127;
         this.updateChannelVolume(channel, scheduleTime);
     }
     setExpression(channelNumber, expression, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.state.expressionMSB = expression / 127;
         this.updateChannelVolume(channel, scheduleTime);
@@ -1317,7 +1353,8 @@ class MidyGM1 {
     }
     setSustainPedal(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         channel.state.sustainPedal = value / 127;
         if (64 <= value) {
             this.processScheduledNotes(channel, (note) => {
@@ -1389,7 +1426,8 @@ class MidyGM1 {
     }
     setPitchBendRange(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheelSensitivity;
         const next = value / 12800;
@@ -1407,7 +1445,8 @@ class MidyGM1 {
     }
     setFineTuning(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const prev = channel.fineTuning;
         const next = value;
         channel.fineTuning = next;
@@ -1422,7 +1461,8 @@ class MidyGM1 {
     }
     setCoarseTuning(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const prev = channel.coarseTuning;
         const next = value;
         channel.coarseTuning = next;
@@ -1430,7 +1470,8 @@ class MidyGM1 {
         this.updateChannelDetune(channel, scheduleTime);
     }
     allSoundOff(channelNumber, _value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         return this.stopActiveNotes(channelNumber, 0, true, scheduleTime);
     }
     resetChannelStates(channelNumber) {
@@ -1482,7 +1523,8 @@ class MidyGM1 {
         }
     }
     allNotesOff(channelNumber, _value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         return this.stopActiveNotes(channelNumber, 0, false, scheduleTime);
     }
     handleUniversalNonRealTimeExclusiveMessage(data, scheduleTime) {
@@ -1503,7 +1545,8 @@ class MidyGM1 {
         }
     }
     GM1SystemOn(scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         this.mode = "GM1";
         for (let i = 0; i < this.channels.length; i++) {
             this.allSoundOff(i, 0, scheduleTime);
@@ -1531,7 +1574,8 @@ class MidyGM1 {
         this.setMasterVolume(volume, scheduleTime);
     }
     setMasterVolume(value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         this.masterVolume.gain
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(value * value, scheduleTime);

package/script/midy-GM2.d.ts

@@ -1,4 +1,4 @@
-export class MidyGM2 {
+export class MidyGM2 extends EventTarget {
     static channelSettings: {
         scheduleIndex: number;
         detune: number;
@@ -50,6 +50,7 @@ export class MidyGM2 {
     isPaused: boolean;
     isStopping: boolean;
     isSeeking: boolean;
+    loop: boolean;
     playPromise: any;
     timeline: any[];
     notePromises: any[];
@@ -105,7 +106,7 @@ export class MidyGM2 {
     createAudioBuffer(voiceParams: any): Promise<any>;
     isLoopDrum(channel: any, noteNumber: any): boolean;
     createBufferSource(channel: any, noteNumber: any, voiceParams: any, audioBuffer: any): any;
-    scheduleTimelineEvents(scheduleTime: any, queueIndex: any): Promise<any>;
+    scheduleTimelineEvents(scheduleTime: any, queueIndex: any): any;
     getQueueIndex(second: any): number;
     resetAllStates(): void;
     updateStates(queueIndex: any, nextQueueIndex: any): void;
@@ -127,8 +128,8 @@ export class MidyGM2 {
     seekTo(second: any): void;
     calcTotalTime(): number;
     currentTime(): number;
-    processScheduledNotes(channel: any, callback: any): void;
-    processActiveNotes(channel: any, scheduleTime: any, callback: any): void;
+    processScheduledNotes(channel: any, callback: any): Promise<void>;
+    processActiveNotes(channel: any, scheduleTime: any, callback: any): Promise<void>;
     createConvolutionReverbImpulse(audioContext: any, decay: any, preDecay: any): any;
     createConvolutionReverb(audioContext: any, impulse: any): {
         input: any;
@@ -182,11 +183,11 @@ export class MidyGM2 {
     noteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     disconnectNote(note: any): void;
     releaseNote(channel: any, note: any, endTime: any): Promise<any>;
-    noteOff(channelNumber: any, noteNumber: any, velocity: any, endTime: any, force: any): Promise<any> | undefined;
+    noteOff(channelNumber: any, noteNumber: any, _velocity: any, endTime: any, force: any): any;
     setNoteIndex(channel: any, index: any): void;
     findNoteOffIndex(channel: any, noteNumber: any): any;
-    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): (Promise<any> | undefined)[];
-    releaseSostenutoPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): (Promise<any> | undefined)[];
+    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): any[];
+    releaseSostenutoPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): any[];
     createMessageHandlers(): any[];
     handleMessage(data: any, scheduleTime: any): void;
     activeSensing(): 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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"}