@marmooo/midy 0.2.7 → 0.2.9

package/package.json

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

@@ -1,6 +1,7 @@
 export class MidyGM1 {
     static channelSettings: {
         currentBufferSource: null;
+        isDrum: boolean;
         detune: number;
         program: number;
         bank: number;
@@ -8,11 +9,12 @@ export class MidyGM1 {
         dataLSB: number;
         rpnMSB: number;
         rpnLSB: number;
+        modulationDepthRange: number;
         fineTuning: number;
         coarseTuning: number;
-        modulationDepthRange: number;
     };
     constructor(audioContext: any);
+    mode: string;
     ticksPerBeat: number;
     totalTime: number;
     noteCheckInterval: number;
@@ -35,6 +37,8 @@ export class MidyGM1 {
     exclusiveClassMap: SparseMap;
     audioContext: any;
     masterVolume: any;
+    scheduler: any;
+    schedulerBuffer: any;
     voiceParamsHandlers: {
         modLfoToPitch: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
         vibLfoToPitch: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
@@ -73,7 +77,7 @@ export class MidyGM1 {
     };
     createChannels(audioContext: any): any[];
     createNoteBuffer(voiceParams: any, isSF3: any): Promise<any>;
-    createNoteBufferNode(audioBuffer: any, voiceParams: any): any;
+    createBufferSource(audioBuffer: any, voiceParams: any): any;
     scheduleTimelineEvents(t: any, offset: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
     playNotes(): Promise<any>;
@@ -93,7 +97,7 @@ export class MidyGM1 {
     seekTo(second: any): void;
     calcTotalTime(): number;
     currentTime(): number;
-    processScheduledNotes(channel: any, scheduleTime: any, callback: any): void;
+    processScheduledNotes(channel: any, callback: any): void;
     getActiveNotes(channel: any, scheduleTime: any): SparseMap;
     getActiveNote(noteList: any, scheduleTime: any): any;
     cbToRatio(cb: any): number;
@@ -115,7 +119,7 @@ export class MidyGM1 {
     stopNote(endTime: any, stopTime: any, scheduledNotes: any, index: any): Promise<any>;
     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): any[];
+    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;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any, scheduleTime: any): void;
@@ -174,15 +178,15 @@ export class MidyGM1 {
     dataEntryMSB(channelNumber: any, value: any, scheduleTime: any): void;
     handlePitchBendRangeRPN(channelNumber: any, scheduleTime: any): void;
     setPitchBendRange(channelNumber: any, value: any, scheduleTime: any): void;
-    handleFineTuningRPN(channelNumber: any): void;
-    setFineTuning(channelNumber: any, value: any): void;
-    handleCoarseTuningRPN(channelNumber: any): void;
-    setCoarseTuning(channelNumber: any, value: any): void;
+    handleFineTuningRPN(channelNumber: any, scheduleTime: any): void;
+    setFineTuning(channelNumber: any, value: any, scheduleTime: any): void;
+    handleCoarseTuningRPN(channelNumber: any, scheduleTime: any): void;
+    setCoarseTuning(channelNumber: any, value: any, scheduleTime: any): void;
     allSoundOff(channelNumber: any, _value: any, scheduleTime: any): Promise<any[]>;
     resetAllControllers(channelNumber: any): void;
     allNotesOff(channelNumber: any, _value: any, scheduleTime: any): Promise<any[]>;
-    handleUniversalNonRealTimeExclusiveMessage(data: any, _scheduleTime: any): void;
-    GM1SystemOn(): void;
+    handleUniversalNonRealTimeExclusiveMessage(data: any, scheduleTime: any): void;
+    GM1SystemOn(scheduleTime: any): void;
     handleUniversalRealTimeExclusiveMessage(data: any, scheduleTime: any): void;
     handleMasterVolumeSysEx(data: any, scheduleTime: any): void;
     setMasterVolume(volume: 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;IAsBE;;;;;;;;;;;;MAYE;IAEF,+BAQC;IA3CD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,kCAA+B;IAC/B,gCAA6B;IAC7B,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAClB,6BAAuC;IAiBrC,kBAAgC;IAChC,kBAA8C;IAC9C;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,6DA2BC;IAED,8DASC;IAED,2EAqDC;IAED,mCAOC;IAED,0BAoDC;IAED,uDAEC;IAED,wDAEC;IAED,6EAEC;IAED;;;MA4EC;IAED,mGAoBC;IAED,wEAMC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,4EASC;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,kGAgDC;IAED,6FAQC;IAED,qFAwBC;IAED,yHAuBC;IAED,yGASC;IAED,qFAUC;IAED,mGA2BC;IAED,gFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAQC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MA2BC;IAED,oFAMC;IAED,6EAkDC;IAED;;;;;;;;;;;;;MAeC;IAED,kGAWC;IAED,wDAWC;IAED,iFAIC;IAED,oEAIC;IAED;;;MAMC;IAED,8DAIC;IAED,4EAIC;IAED,sEAGC;IAED,2DAUC;IAED,yEAMC;IAED,kFAeC;IAED,2DAMC;IAED,uDAkBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,8CAKC;IAED,oDAOC;IAED,gDAKC;IAED,sDAOC;IAED,gFAGC;IAED,8CAqBC;IAED,gFAGC;IAED,gFAgBC;IAED,oBAMC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAED,6DAUC;CACF;AA95CD;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;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"}

package/script/midy-GM1.js

@@ -173,6 +173,12 @@ const volumeEnvelopeKeys = [
 const volumeEnvelopeKeySet = new Set(volumeEnvelopeKeys);
 class MidyGM1 {
     constructor(audioContext) {
+        Object.defineProperty(this, "mode", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "GM1"
+        });
         Object.defineProperty(this, "ticksPerBeat", {
             enumerable: true,
             configurable: true,
@@ -295,10 +301,16 @@ class MidyGM1 {
         });
         this.audioContext = audioContext;
         this.masterVolume = new GainNode(audioContext);
+        this.scheduler = new GainNode(audioContext, { gain: 0 });
+        this.schedulerBuffer = new AudioBuffer({
+            length: 1,
+            sampleRate: audioContext.sampleRate,
+        });
         this.voiceParamsHandlers = this.createVoiceParamsHandlers();
         this.controlChangeHandlers = this.createControlChangeHandlers();
         this.channels = this.createChannels(audioContext);
         this.masterVolume.connect(audioContext.destination);
+        this.scheduler.connect(audioContext.destination);
         this.GM1SystemOn();
     }
     initSoundFontTable() {
@@ -358,6 +370,7 @@ class MidyGM1 {
                 state: new ControllerState(),
                 ...this.setChannelAudioNodes(audioContext),
                 scheduledNotes: new SparseMap(128),
+                sustainNotes: [],
             };
         });
         return channels;
@@ -391,7 +404,7 @@ class MidyGM1 {
             return audioBuffer;
         }
     }
-    createNoteBufferNode(audioBuffer, voiceParams) {
+    createBufferSource(audioBuffer, voiceParams) {
         const bufferSource = new AudioBufferSourceNode(this.audioContext);
         bufferSource.buffer = audioBuffer;
         bufferSource.loop = voiceParams.sampleModes % 2 !== 0;
@@ -415,7 +428,7 @@ class MidyGM1 {
                     }
                 /* falls through */
                 case "noteOff": {
-                    const notePromise = this.scheduleNoteOff(event.channel, event.noteNumber, event.velocity, startTime);
+                    const notePromise = this.scheduleNoteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
                     if (notePromise) {
                         this.notePromises.push(notePromise);
                     }
@@ -579,15 +592,10 @@ class MidyGM1 {
     stopChannelNotes(channelNumber, velocity, force, scheduleTime) {
         const channel = this.channels[channelNumber];
         const promises = [];
-        channel.scheduledNotes.forEach((noteList) => {
-            for (let i = 0; i < noteList.length; i++) {
-                const note = noteList[i];
-                if (!note)
-                    continue;
-                const promise = this.scheduleNoteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force);
-                this.notePromises.push(promise);
-                promises.push(promise);
-            }
+        this.processScheduledNotes(channel, (note) => {
+            const promise = this.scheduleNoteOff(channelNumber, note.noteNumber, velocity, scheduleTime, force);
+            this.notePromises.push(promise);
+            promises.push(promise);
         });
         channel.scheduledNotes.clear();
         return Promise.all(promises);
@@ -643,14 +651,12 @@ class MidyGM1 {
         const now = this.audioContext.currentTime;
         return this.resumeTime + now - this.startTime - this.startDelay;
     }
-    processScheduledNotes(channel, scheduleTime, callback) {
+    processScheduledNotes(channel, callback) {
         channel.scheduledNotes.forEach((noteList) => {
             for (let i = 0; i < noteList.length; i++) {
                 const note = noteList[i];
                 if (!note)
                     continue;
-                if (scheduleTime < note.startTime)
-                    continue;
                 callback(note);
             }
         });
@@ -696,7 +702,7 @@ class MidyGM1 {
         return tuning + pitch;
     }
     updateChannelDetune(channel, scheduleTime) {
-        this.processScheduledNotes(channel, scheduleTime, (note) => {
+        this.processScheduledNotes(channel, (note) => {
             this.updateDetune(channel, note, scheduleTime);
         });
     }
@@ -814,7 +820,7 @@ class MidyGM1 {
         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);
-        note.bufferSource = this.createNoteBufferNode(audioBuffer, voiceParams);
+        note.bufferSource = this.createBufferSource(audioBuffer, voiceParams);
         note.volumeEnvelopeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
             type: "lowpass",
@@ -845,15 +851,17 @@ class MidyGM1 {
         const note = await this.createNote(channel, voice, noteNumber, velocity, startTime, isSF3);
         note.volumeEnvelopeNode.connect(channel.gainL);
         note.volumeEnvelopeNode.connect(channel.gainR);
+        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.ending) {
+                if (prevNote && !prevNote.ending) {
                     this.scheduleNoteOff(prevChannelNumber, prevNote.noteNumber, 0, // velocity,
-                    startTime, undefined, // portamentoNoteNumber
-                    true);
+                    startTime, true);
                 }
             }
             this.exclusiveClassMap.set(exclusiveClass, [note, channelNumber]);
@@ -897,7 +905,7 @@ class MidyGM1 {
     }
     scheduleNoteOff(channelNumber, noteNumber, _velocity, endTime, force) {
         const channel = this.channels[channelNumber];
-        if (!force && 0.5 < channel.state.sustainPedal)
+        if (!force && 0.5 <= channel.state.sustainPedal)
             return;
         if (!channel.scheduledNotes.has(noteNumber))
             return;
@@ -925,11 +933,11 @@ class MidyGM1 {
         const velocity = halfVelocity * 2;
         const channel = this.channels[channelNumber];
         const promises = [];
-        this.processScheduledNotes(channel, scheduleTime, (note) => {
-            const { noteNumber } = note;
-            const promise = this.noteOff(channelNumber, noteNumber, velocity);
+        for (let i = 0; i < channel.sustainNotes.length; i++) {
+            const promise = this.noteOff(channelNumber, channel.sustainNotes[i].noteNumber, velocity, scheduleTime);
             promises.push(promise);
-        });
+        }
+        channel.sustainNotes = [];
         return promises;
     }
     handleMIDIMessage(statusByte, data1, data2, scheduleTime) {
@@ -959,8 +967,10 @@ class MidyGM1 {
         this.setPitchBend(channelNumber, pitchBend, scheduleTime);
     }
     setPitchBend(channelNumber, value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheel * 2 - 1;
         const next = (value - 8192) / 8192;
@@ -1040,48 +1050,43 @@ class MidyGM1 {
         return state;
     }
     applyVoiceParams(channel, controllerType, scheduleTime) {
-        channel.scheduledNotes.forEach((noteList) => {
-            for (let i = 0; i < noteList.length; i++) {
-                const note = noteList[i];
-                if (!note)
+        this.processScheduledNotes(channel, (note) => {
+            const controllerState = this.getControllerState(channel, note.noteNumber, note.velocity);
+            const voiceParams = note.voice.getParams(controllerType, controllerState);
+            let appliedFilterEnvelope = false;
+            let appliedVolumeEnvelope = false;
+            for (const [key, value] of Object.entries(voiceParams)) {
+                const prevValue = note.voiceParams[key];
+                if (value === prevValue)
                     continue;
-                const controllerState = this.getControllerState(channel, note.noteNumber, note.velocity);
-                const voiceParams = note.voice.getParams(controllerType, controllerState);
-                let appliedFilterEnvelope = false;
-                let appliedVolumeEnvelope = false;
-                for (const [key, value] of Object.entries(voiceParams)) {
-                    const prevValue = note.voiceParams[key];
-                    if (value === prevValue)
+                note.voiceParams[key] = value;
+                if (key in this.voiceParamsHandlers) {
+                    this.voiceParamsHandlers[key](channel, note, prevValue, scheduleTime);
+                }
+                else if (filterEnvelopeKeySet.has(key)) {
+                    if (appliedFilterEnvelope)
                         continue;
-                    note.voiceParams[key] = value;
-                    if (key in this.voiceParamsHandlers) {
-                        this.voiceParamsHandlers[key](channel, note, prevValue, scheduleTime);
-                    }
-                    else if (filterEnvelopeKeySet.has(key)) {
-                        if (appliedFilterEnvelope)
-                            continue;
-                        appliedFilterEnvelope = true;
-                        const noteVoiceParams = note.voiceParams;
-                        for (let i = 0; i < filterEnvelopeKeys.length; i++) {
-                            const key = filterEnvelopeKeys[i];
-                            if (key in voiceParams)
-                                noteVoiceParams[key] = voiceParams[key];
-                        }
-                        this.setFilterEnvelope(note, scheduleTime);
-                        this.setPitchEnvelope(note, scheduleTime);
+                    appliedFilterEnvelope = true;
+                    const noteVoiceParams = note.voiceParams;
+                    for (let i = 0; i < filterEnvelopeKeys.length; i++) {
+                        const key = filterEnvelopeKeys[i];
+                        if (key in voiceParams)
+                            noteVoiceParams[key] = voiceParams[key];
                     }
-                    else if (volumeEnvelopeKeySet.has(key)) {
-                        if (appliedVolumeEnvelope)
-                            continue;
-                        appliedVolumeEnvelope = true;
-                        const noteVoiceParams = note.voiceParams;
-                        for (let i = 0; i < volumeEnvelopeKeys.length; i++) {
-                            const key = volumeEnvelopeKeys[i];
-                            if (key in voiceParams)
-                                noteVoiceParams[key] = voiceParams[key];
-                        }
-                        this.setVolumeEnvelope(channel, note, scheduleTime);
+                    this.setFilterEnvelope(note, scheduleTime);
+                    this.setPitchEnvelope(note, scheduleTime);
+                }
+                else if (volumeEnvelopeKeySet.has(key)) {
+                    if (appliedVolumeEnvelope)
+                        continue;
+                    appliedVolumeEnvelope = true;
+                    const noteVoiceParams = note.voiceParams;
+                    for (let i = 0; i < volumeEnvelopeKeys.length; i++) {
+                        const key = volumeEnvelopeKeys[i];
+                        if (key in voiceParams)
+                            noteVoiceParams[key] = voiceParams[key];
                     }
+                    this.setVolumeEnvelope(note, scheduleTime);
                 }
             }
         });
@@ -1114,9 +1119,8 @@ class MidyGM1 {
         }
     }
     updateModulation(channel, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const depth = channel.state.modulationDepth * channel.modulationDepthRange;
-        this.processScheduledNotes(channel, scheduleTime, (note) => {
+        this.processScheduledNotes(channel, (note) => {
             if (note.modulationDepth) {
                 note.modulationDepth.gain.setValueAtTime(depth, scheduleTime);
             }
@@ -1128,10 +1132,14 @@ 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);
     }
     setVolume(channelNumber, volume, scheduleTime) {
+        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.state.volume = volume / 127;
         this.updateChannelVolume(channel, scheduleTime);
@@ -1144,11 +1152,13 @@ class MidyGM1 {
         };
     }
     setPan(channelNumber, pan, scheduleTime) {
+        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.state.pan = pan / 127;
         this.updateChannelVolume(channel, scheduleTime);
     }
     setExpression(channelNumber, expression, scheduleTime) {
+        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.state.expression = expression / 127;
         this.updateChannelVolume(channel, scheduleTime);
@@ -1169,9 +1179,17 @@ class MidyGM1 {
             .setValueAtTime(volume * gainRight, scheduleTime);
     }
     setSustainPedal(channelNumber, value, scheduleTime) {
+        const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
         scheduleTime ??= this.audioContext.currentTime;
-        this.channels[channelNumber].state.sustainPedal = value / 127;
-        if (value < 64) {
+        channel.state.sustainPedal = value / 127;
+        if (64 <= value) {
+            this.processScheduledNotes(channel, (note) => {
+                channel.sustainNotes.push(note);
+            });
+        }
+        else {
             this.releaseSustainPedal(channelNumber, value, scheduleTime);
         }
     }
@@ -1209,10 +1227,10 @@ class MidyGM1 {
                 this.handlePitchBendRangeRPN(channelNumber, scheduleTime);
                 break;
             case 1:
-                this.handleFineTuningRPN(channelNumber);
+                this.handleFineTuningRPN(channelNumber, scheduleTime);
                 break;
             case 2:
-                this.handleCoarseTuningRPN(channelNumber);
+                this.handleCoarseTuningRPN(channelNumber, scheduleTime);
                 break;
             default:
                 console.warn(`Channel ${channelNumber}: Unsupported RPN MSB=${channel.rpnMSB} LSB=${channel.rpnLSB}`);
@@ -1235,8 +1253,10 @@ class MidyGM1 {
         this.setPitchBendRange(channelNumber, pitchBendRange, scheduleTime);
     }
     setPitchBendRange(channelNumber, value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         const state = channel.state;
         const prev = state.pitchWheelSensitivity;
         const next = value / 128;
@@ -1245,33 +1265,39 @@ class MidyGM1 {
         this.updateChannelDetune(channel, scheduleTime);
         this.applyVoiceParams(channel, 16, scheduleTime);
     }
-    handleFineTuningRPN(channelNumber) {
+    handleFineTuningRPN(channelNumber, scheduleTime) {
         const channel = this.channels[channelNumber];
         this.limitData(channel, 0, 127, 0, 127);
         const fineTuning = channel.dataMSB * 128 + channel.dataLSB;
-        this.setFineTuning(channelNumber, fineTuning);
+        this.setFineTuning(channelNumber, fineTuning, scheduleTime);
     }
-    setFineTuning(channelNumber, value) {
+    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
         channel.fineTuning = next;
         channel.detune += next - prev;
-        this.updateChannelDetune(channel);
+        this.updateChannelDetune(channel, scheduleTime);
     }
-    handleCoarseTuningRPN(channelNumber) {
+    handleCoarseTuningRPN(channelNumber, scheduleTime) {
         const channel = this.channels[channelNumber];
         this.limitDataMSB(channel, 0, 127);
         const coarseTuning = channel.dataMSB;
-        this.setCoarseTuning(channelNumber, coarseTuning);
+        this.setCoarseTuning(channelNumber, coarseTuning, scheduleTime);
     }
-    setCoarseTuning(channelNumber, value) {
+    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
         channel.coarseTuning = next;
         channel.detune += next - prev;
-        this.updateChannelDetune(channel);
+        this.updateChannelDetune(channel, scheduleTime);
     }
     allSoundOff(channelNumber, _value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
@@ -1303,12 +1329,12 @@ class MidyGM1 {
         scheduleTime ??= this.audioContext.currentTime;
         return this.stopChannelNotes(channelNumber, 0, false, scheduleTime);
     }
-    handleUniversalNonRealTimeExclusiveMessage(data, _scheduleTime) {
+    handleUniversalNonRealTimeExclusiveMessage(data, scheduleTime) {
         switch (data[2]) {
             case 9:
                 switch (data[3]) {
                     case 1:
-                        this.GM1SystemOn();
+                        this.GM1SystemOn(scheduleTime);
                         break;
                     case 2: // GM System Off
                         break;
@@ -1320,12 +1346,17 @@ class MidyGM1 {
                 console.warn(`Unsupported Exclusive Message: ${data}`);
         }
     }
-    GM1SystemOn() {
+    GM1SystemOn(scheduleTime) {
+        scheduleTime ??= this.audioContext.currentTime;
+        this.mode = "GM1";
         for (let i = 0; i < this.channels.length; i++) {
+            this.allSoundOff(i, 0, scheduleTime);
             const channel = this.channels[i];
             channel.bank = 0;
+            channel.isDrum = false;
         }
         this.channels[9].bank = 128;
+        this.channels[9].isDrum = true;
     }
     handleUniversalRealTimeExclusiveMessage(data, scheduleTime) {
         switch (data[2]) {
@@ -1368,13 +1399,20 @@ class MidyGM1 {
     }
     scheduleTask(callback, scheduleTime) {
         return new Promise((resolve) => {
-            const bufferSource = new AudioBufferSourceNode(this.audioContext);
+            const bufferSource = new AudioBufferSourceNode(this.audioContext, {
+                buffer: this.schedulerBuffer,
+            });
+            bufferSource.connect(this.scheduler);
             bufferSource.onended = () => {
-                callback();
-                resolve();
+                try {
+                    callback();
+                }
+                finally {
+                    bufferSource.disconnect();
+                    resolve();
+                }
             };
             bufferSource.start(scheduleTime);
-            bufferSource.stop(scheduleTime);
         });
     }
 }
@@ -1385,6 +1423,7 @@ Object.defineProperty(MidyGM1, "channelSettings", {
     writable: true,
     value: {
         currentBufferSource: null,
+        isDrum: false,
         detune: 0,
         program: 0,
         bank: 0,
@@ -1392,8 +1431,8 @@ Object.defineProperty(MidyGM1, "channelSettings", {
         dataLSB: 0,
         rpnMSB: 127,
         rpnLSB: 127,
+        modulationDepthRange: 50, // cent
         fineTuning: 0, // cb
         coarseTuning: 0, // cb
-        modulationDepthRange: 50, // cent
     }
 });