@marmooo/midy 0.4.0 → 0.4.2

package/README.md

@@ -22,6 +22,7 @@ This library provides several files depending on the implementation level.
 
 - [@marmooo/midi-player](https://marmooo.github.io/midi-player/) - GUI library
 - [Humidy](https://marmooo.github.io/humidy/) - GM2 MIDI mixer app
+- [Timidy](https://marmooo.github.io/timidy/) - Timidity++ style MIDI player
 
 ## Support Status
 
@@ -54,7 +55,7 @@ All implementations follow the specification.
 import { Midy } from "midy.js";
 
 const audioContext = new AudioContext();
-await audioContext.suspend();
+if (audioContext.state === "running") await audioContext.suspend();
 const midy = new Midy(audioContext);
 await midy.loadMIDI("test.mid");
 await midy.loadSoundFont("test.sf3");
@@ -64,6 +65,7 @@ await midy.start();
 ### Playback
 
 ```js
+midy.loop = true;
 await midy.start();
 await midy.stop();
 await midy.pause();
@@ -71,6 +73,17 @@ await midy.resume();
 midy.seekTo(second);
 ```
 
+### Events
+
+```js
+midy.addEventListener("looped", func);
+midy.addEventListener("started", func);
+midy.addEventListener("stopped", func);
+midy.addEventListener("paused", func);
+midy.addEventListener("resumed", func);
+midy.addEventListener("seeked", func);
+```
+
 ### MIDI Message
 
 There are functions that handle MIDI messages as they are, as well as simplified

package/esm/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): void;
+    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): void[];
+    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<void>;
+    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/esm/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,kDAUC;IAED,4DASC;IAED,yEAqDC;IAED,mCAOC;IAED,uBASC;IAED,yDA2BC;IAED,2BAwCC;IAED,uDAEC;IAED,wDAEC;IAED,qCAKC;IAED;;;MAwDC;IAED,kGAeC;IAED,mGAeC;IAED,wEAMC;IAED,uBAMC;IAED,sBAKC;IAED,uBAQC;IAED,wBAKC;IAED,0BAKC;IAED,wBAOC;IAED,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,uEAmCC;IAED,0EAiBC;IAED,oEASC;IAED,0FAwBC;IAED,gCASC;IAED,iEAqBC;IAED,4FAmBC;IAED,6CAUC;IAED,qDAUC;IAED,sFAeC;IAED,+BAmBC;IAED,kDAOC;IAED,uGA2BC;IAED,mFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAWC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MAiCC;IAED,oFAMC;IAED,6EA2BC;IAED,qCAeC;IAED,+FAWC;IAED,wDASC;IAED,iFAKC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,2DAMC;IAED,uDAkBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAMC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,6CAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCASC;IAED,4EAaC;IAED,4DAGC;IAED,qDAKC;IAED,gDAYC;IAGD,6DAgBC;CACF"}
+{"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/esm/midy-GM1.js

@@ -26,12 +26,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,
@@ -77,6 +71,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
@@ -86,11 +83,11 @@ const defaultControllerState = {
     pitchWheel: { type: 14, defaultValue: 8192 / 16383 },
     pitchWheelSensitivity: { type: 16, defaultValue: 2 / 128 },
     link: { type: 127, defaultValue: 0 },
-    modulationDepth: { type: 128 + 1, defaultValue: 0 },
+    modulationDepthMSB: { type: 128 + 1, defaultValue: 0 },
     // dataMSB: { type: 128 + 6, defaultValue: 0, },
-    volume: { type: 128 + 7, defaultValue: 100 / 127 },
-    pan: { type: 128 + 10, defaultValue: 64 / 127 },
-    expression: { type: 128 + 11, defaultValue: 1 },
+    volumeMSB: { type: 128 + 7, defaultValue: 100 / 127 },
+    panMSB: { type: 128 + 10, defaultValue: 64 / 127 },
+    expressionMSB: { type: 128 + 11, defaultValue: 1 },
     // dataLSB: { type: 128 + 38, defaultValue: 0, },
     sustainPedal: { type: 128 + 64, defaultValue: 0 },
     // rpnLSB: { type: 128 + 100, defaultValue: 127 },
@@ -150,8 +147,9 @@ const pitchEnvelopeKeys = [
     "playbackRate",
 ];
 const pitchEnvelopeKeySet = new Set(pitchEnvelopeKeys);
-export class MidyGM1 {
+export class MidyGM1 extends EventTarget {
     constructor(audioContext) {
+        super();
         Object.defineProperty(this, "mode", {
             enumerable: true,
             configurable: true,
@@ -266,6 +264,12 @@ export 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,
@@ -410,7 +414,7 @@ export class MidyGM1 {
         return soundFontIndex * (2 ** 32) + (instrument << 16) + sampleID;
     }
     createChannelAudioNodes(audioContext) {
-        const { gainLeft, gainRight } = this.panToGain(defaultControllerState.pan.defaultValue);
+        const { gainLeft, gainRight } = this.panToGain(defaultControllerState.panMSB.defaultValue);
         const gainL = new GainNode(audioContext, { gain: gainLeft });
         const gainR = new GainNode(audioContext, { gain: gainRight });
         const merger = new ChannelMergerNode(audioContext, { numberOfInputs: 2 });
@@ -438,10 +442,9 @@ export class MidyGM1 {
         return channels;
     }
     async createAudioBuffer(voiceParams) {
-        const sample = voiceParams.sample;
-        const sampleStart = voiceParams.start;
-        const sampleEnd = sample.data.length + voiceParams.end;
-        const audioBuffer = await sample.toAudioBuffer(this.audioContext, sampleStart, sampleEnd);
+        const { sample, start, end } = voiceParams;
+        const sampleEnd = sample.data.length + end;
+        const audioBuffer = await sample.toAudioBuffer(this.audioContext, start, sampleEnd);
         return audioBuffer;
     }
     createBufferSource(voiceParams, audioBuffer) {
@@ -454,7 +457,7 @@ export 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;
@@ -466,12 +469,10 @@ export 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": {
-                    const notePromise = this.noteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
-                    if (notePromise)
-                        this.notePromises.push(notePromise);
+                    this.noteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
                     break;
                 }
                 case "controller":
@@ -509,22 +510,23 @@ export 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,44 +534,80 @@ export 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 (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;
@@ -676,24 +714,20 @@ export 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;
@@ -716,19 +750,23 @@ export 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)
@@ -737,8 +775,10 @@ export 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);
@@ -904,7 +944,13 @@ export class MidyGM1 {
         }
         note.bufferSource.connect(note.filterNode);
         note.filterNode.connect(note.volumeEnvelopeNode);
-        note.bufferSource.start(startTime);
+        if (voiceParams.sample.type === "compressed") {
+            const offset = voiceParams.start / audioBuffer.sampleRate;
+            note.bufferSource.start(startTime, offset);
+        }
+        else {
+            note.bufferSource.start(startTime);
+        }
         return note;
     }
     handleExclusiveClass(note, channelNumber, startTime) {
@@ -954,11 +1000,7 @@ export 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();
@@ -992,7 +1034,7 @@ export 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;
@@ -1000,13 +1042,13 @@ export class MidyGM1 {
         if (index < 0)
             return;
         const note = channel.scheduledNotes[index];
-        if (note.pending) {
-            note.offEvent = { velocity, startTime: endTime };
-            return;
-        }
         note.ending = true;
         this.setNoteIndex(channel, index);
-        this.releaseNote(channel, note, endTime);
+        const promise = note.ready.then(() => {
+            return this.releaseNote(channel, note, endTime);
+        });
+        this.notePromises.push(promise);
+        return promise;
     }
     setNoteIndex(channel, index) {
         let allEnds = true;
@@ -1092,7 +1134,8 @@ export 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;
@@ -1104,11 +1147,12 @@ export class MidyGM1 {
     setModLfoToPitch(channel, note, scheduleTime) {
         if (note.modulationDepth) {
             const modLfoToPitch = note.voiceParams.modLfoToPitch;
-            const baseDepth = Math.abs(modLfoToPitch) + channel.state.modulationDepth;
-            const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
+            const baseDepth = Math.abs(modLfoToPitch) +
+                channel.state.modulationDepthMSB;
+            const depth = baseDepth * Math.sign(modLfoToPitch);
             note.modulationDepth.gain
                 .cancelScheduledValues(scheduleTime)
-                .setValueAtTime(modulationDepth, scheduleTime);
+                .setValueAtTime(depth, scheduleTime);
         }
         else {
             this.startModulation(channel, note, scheduleTime);
@@ -1145,18 +1189,18 @@ export class MidyGM1 {
     createVoiceParamsHandlers() {
         return {
             modLfoToPitch: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                if (0 < channel.state.modulationDepthMSB) {
                     this.setModLfoToPitch(channel, note, scheduleTime);
                 }
             },
             vibLfoToPitch: (_channel, _note, _scheduleTime) => { },
             modLfoToFilterFc: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                if (0 < channel.state.modulationDepthMSB) {
                     this.setModLfoToFilterFc(note, scheduleTime);
                 }
             },
             modLfoToVolume: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                if (0 < channel.state.modulationDepthMSB) {
                     this.setModLfoToVolume(note, scheduleTime);
                 }
             },
@@ -1168,7 +1212,7 @@ export class MidyGM1 {
                 }
             },
             freqModLFO: (_channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                if (0 < channel.state.modulationDepthMSB) {
                     this.setFreqModLFO(note, scheduleTime);
                 }
             },
@@ -1243,7 +1287,8 @@ export class MidyGM1 {
         }
     }
     updateModulation(channel, scheduleTime) {
-        const depth = channel.state.modulationDepth * channel.modulationDepthRange;
+        const depth = channel.state.modulationDepthMSB *
+            channel.modulationDepthRange;
         this.processScheduledNotes(channel, (note) => {
             if (note.modulationDepth) {
                 note.modulationDepth.gain.setValueAtTime(depth, scheduleTime);
@@ -1255,14 +1300,16 @@ export class MidyGM1 {
     }
     setModulationDepth(channelNumber, modulation, scheduleTime) {
         const channel = this.channels[channelNumber];
-        scheduleTime ??= this.audioContext.currentTime;
-        channel.state.modulationDepth = modulation / 127;
+        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.volume = volume / 127;
+        channel.state.volumeMSB = volume / 127;
         this.updateChannelVolume(channel, scheduleTime);
     }
     panToGain(pan) {
@@ -1273,15 +1320,17 @@ export class MidyGM1 {
         };
     }
     setPan(channelNumber, pan, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.pan = pan / 127;
+        channel.state.panMSB = pan / 127;
         this.updateChannelVolume(channel, scheduleTime);
     }
     setExpression(channelNumber, expression, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.expression = expression / 127;
+        channel.state.expressionMSB = expression / 127;
         this.updateChannelVolume(channel, scheduleTime);
     }
     dataEntryLSB(channelNumber, value, scheduleTime) {
@@ -1290,8 +1339,8 @@ export class MidyGM1 {
     }
     updateChannelVolume(channel, scheduleTime) {
         const state = channel.state;
-        const volume = state.volume * state.expression;
-        const { gainLeft, gainRight } = this.panToGain(state.pan);
+        const volume = state.volumeMSB * state.expressionMSB;
+        const { gainLeft, gainRight } = this.panToGain(state.panMSB);
         channel.gainL.gain
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(volume * gainLeft, scheduleTime);
@@ -1301,7 +1350,8 @@ export 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) => {
@@ -1373,7 +1423,8 @@ export 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;
@@ -1391,7 +1442,8 @@ export 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;
@@ -1406,7 +1458,8 @@ export 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;
@@ -1414,7 +1467,8 @@ export 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) {
@@ -1439,8 +1493,8 @@ export class MidyGM1 {
     resetAllControllers(channelNumber, _value, scheduleTime) {
         const keys = [
             "pitchWheel",
-            "expression",
-            "modulationDepth",
+            "expressionMSB",
+            "modulationDepthMSB",
             "sustainPedal",
         ];
         const channel = this.channels[channelNumber];
@@ -1466,7 +1520,8 @@ export 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) {
@@ -1487,7 +1542,8 @@ export 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);
@@ -1515,7 +1571,8 @@ export 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);