@marmooo/midy 0.2.8 → 0.2.9

package/script/midy-GM2.js

@@ -242,6 +242,12 @@ const volumeEnvelopeKeys = [
 const volumeEnvelopeKeySet = new Set(volumeEnvelopeKeys);
 class MidyGM2 {
     constructor(audioContext, options = this.defaultOptions) {
+        Object.defineProperty(this, "mode", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "GM2"
+        });
         Object.defineProperty(this, "ticksPerBeat", {
             enumerable: true,
             configurable: true,
@@ -420,6 +426,11 @@ class MidyGM2 {
         this.audioContext = audioContext;
         this.options = { ...this.defaultOptions, ...options };
         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);
@@ -428,6 +439,7 @@ class MidyGM2 {
         this.chorusEffect.output.connect(this.masterVolume);
         this.reverbEffect.output.connect(this.masterVolume);
         this.masterVolume.connect(audioContext.destination);
+        this.scheduler.connect(audioContext.destination);
         this.GM2SystemOn();
     }
     initSoundFontTable() {
@@ -526,10 +538,24 @@ class MidyGM2 {
             return audioBuffer;
         }
     }
-    createNoteBufferNode(audioBuffer, voiceParams) {
+    calcLoopMode(channel, note, voiceParams) {
+        if (channel.isDrum) {
+            const noteNumber = note.noteNumber;
+            if (noteNumber === 88 || 47 <= noteNumber && noteNumber <= 84) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+        else {
+            return voiceParams.sampleModes % 2 !== 0;
+        }
+    }
+    createBufferSource(channel, note, voiceParams, audioBuffer) {
         const bufferSource = new AudioBufferSourceNode(this.audioContext);
         bufferSource.buffer = audioBuffer;
-        bufferSource.loop = voiceParams.sampleModes % 2 !== 0;
+        bufferSource.loop = this.calcLoopMode(channel, note, voiceParams);
         if (bufferSource.loop) {
             bufferSource.loopStart = voiceParams.loopStart / voiceParams.sampleRate;
             bufferSource.loopEnd = voiceParams.loopEnd / voiceParams.sampleRate;
@@ -1006,7 +1032,9 @@ class MidyGM2 {
         return 8.176 * this.centToRate(cent);
     }
     calcChannelDetune(channel) {
-        const masterTuning = this.masterCoarseTuning + this.masterFineTuning;
+        const masterTuning = channel.isDrum
+            ? 0
+            : this.masterCoarseTuning + this.masterFineTuning;
         const channelTuning = channel.coarseTuning + channel.fineTuning;
         const tuning = masterTuning + channelTuning;
         const pitchWheel = channel.state.pitchWheel * 2 - 1;
@@ -1032,9 +1060,8 @@ class MidyGM2 {
             .setValueAtTime(detune, scheduleTime);
     }
     getPortamentoTime(channel) {
-        const factor = 5 * Math.log(10) / 127;
-        const time = channel.state.portamentoTime;
-        return Math.log(time) / factor;
+        const factor = 5 * Math.log(10) * 127;
+        return channel.state.portamentoTime * factor;
     }
     setPortamentoStartVolumeEnvelope(channel, note, scheduleTime) {
         const { voiceParams, startTime } = note;
@@ -1195,7 +1222,7 @@ class MidyGM2 {
         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(channel, note, voiceParams, audioBuffer);
         note.volumeNode = new GainNode(this.audioContext);
         note.gainL = new GainNode(this.audioContext);
         note.gainR = new GainNode(this.audioContext);
@@ -1239,14 +1266,21 @@ class MidyGM2 {
         note.bufferSource.start(startTime);
         return note;
     }
-    calcBank(channel, channelNumber) {
-        if (channel.bankMSB === 121) {
-            return 0;
-        }
-        if (channelNumber % 9 <= 1 && channel.bankMSB === 120) {
-            return 128;
+    calcBank(channel) {
+        switch (this.mode) {
+            case "GM1":
+                if (channel.isDrum)
+                    return 128;
+                return 0;
+            case "GM2":
+                if (channel.bankMSB === 121)
+                    return 0;
+                if (channel.isDrum)
+                    return 128;
+                return channel.bank;
+            default:
+                return channel.bank;
         }
-        return channel.bank;
     }
     async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime, portamento) {
         const channel = this.channels[channelNumber];
@@ -1270,7 +1304,7 @@ class MidyGM2 {
             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, true, // force
                     undefined);
@@ -1419,9 +1453,21 @@ class MidyGM2 {
         const channel = this.channels[channelNumber];
         channel.bank = channel.bankMSB * 128 + channel.bankLSB;
         channel.program = program;
+        if (this.mode === "GM2") {
+            switch (channel.bankMSB) {
+                case 120:
+                    channel.isDrum = true;
+                    break;
+                case 121:
+                    channel.isDrum = false;
+                    break;
+            }
+        }
     }
     handleChannelPressure(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
         const prev = channel.state.channelPressure;
         const next = value / 127;
         channel.state.channelPressure = next;
@@ -1440,8 +1486,10 @@ class MidyGM2 {
         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;
@@ -1713,15 +1761,16 @@ class MidyGM2 {
         });
     }
     setModulationDepth(channelNumber, modulation, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.modulationDepth = modulation / 127;
         this.updateModulation(channel, scheduleTime);
     }
     setPortamentoTime(channelNumber, portamentoTime) {
         const channel = this.channels[channelNumber];
-        const factor = 5 * Math.log(10) / 127;
-        channel.state.portamentoTime = Math.exp(factor * portamentoTime);
+        channel.state.portamentoTime = portamentoTime / 127;
     }
     setKeyBasedVolume(channel, scheduleTime) {
         this.processScheduledNotes(channel, (note) => {
@@ -1793,8 +1842,10 @@ class MidyGM2 {
             .setValueAtTime(volume * gainRight, scheduleTime);
     }
     setSustainPedal(channelNumber, value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.sustainPedal = value / 127;
         if (64 <= value) {
             this.processScheduledNotes(channel, (note) => {
@@ -1806,11 +1857,16 @@ class MidyGM2 {
         }
     }
     setPortamento(channelNumber, value) {
-        this.channels[channelNumber].state.portamento = value / 127;
+        const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        channel.state.portamento = value / 127;
     }
     setSostenutoPedal(channelNumber, value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.sostenutoPedal = value / 127;
         if (64 <= value) {
             channel.sostenutoNotes = this.getActiveNotes(channel, scheduleTime);
@@ -1819,9 +1875,22 @@ class MidyGM2 {
             this.releaseSostenutoPedal(channelNumber, value, scheduleTime);
         }
     }
-    setSoftPedal(channelNumber, softPedal, _scheduleTime) {
+    setSoftPedal(channelNumber, softPedal, scheduleTime) {
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.softPedal = softPedal / 127;
+        this.processScheduledNotes(channel, (note) => {
+            if (note.portamento) {
+                this.setPortamentoStartVolumeEnvelope(channel, note, scheduleTime);
+                this.setPortamentoStartFilterEnvelope(channel, note, scheduleTime);
+            }
+            else {
+                this.setVolumeEnvelope(channel, note, scheduleTime);
+                this.setFilterEnvelope(channel, note, scheduleTime);
+            }
+        });
     }
     setReverbSendLevel(channelNumber, reverbSendLevel, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
@@ -1950,8 +2019,10 @@ class MidyGM2 {
         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;
@@ -1967,8 +2038,10 @@ class MidyGM2 {
         this.setFineTuning(channelNumber, fineTuning, scheduleTime);
     }
     setFineTuning(channelNumber, value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         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;
@@ -1982,8 +2055,10 @@ class MidyGM2 {
         this.setCoarseTuning(channelNumber, coarseTuning, scheduleTime);
     }
     setCoarseTuning(channelNumber, value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         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;
@@ -1997,8 +2072,10 @@ class MidyGM2 {
         this.setModulationDepthRange(channelNumber, modulationDepthRange, scheduleTime);
     }
     setModulationDepthRange(channelNumber, modulationDepthRange, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.modulationDepthRange = modulationDepthRange;
         this.updateModulation(channel, scheduleTime);
     }
@@ -2066,12 +2143,12 @@ class MidyGM2 {
             case 9:
                 switch (data[3]) {
                     case 1:
-                        this.GM1SystemOn();
+                        this.GM1SystemOn(scheduleTime);
                         break;
                     case 2: // GM System Off
                         break;
                     case 3:
-                        this.GM2SystemOn();
+                        this.GM2SystemOn(scheduleTime);
                         break;
                     default:
                         console.warn(`Unsupported Exclusive Message: ${data}`);
@@ -2081,25 +2158,35 @@ class MidyGM2 {
                 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.bankMSB = 0;
             channel.bankLSB = 0;
             channel.bank = 0;
+            channel.isDrum = false;
         }
         this.channels[9].bankMSB = 1;
         this.channels[9].bank = 128;
+        this.channels[9].isDrum = true;
     }
-    GM2SystemOn() {
+    GM2SystemOn(scheduleTime) {
+        scheduleTime ??= this.audioContext.currentTime;
+        this.mode = "GM2";
         for (let i = 0; i < this.channels.length; i++) {
+            this.allSoundOff(i, 0, scheduleTime);
             const channel = this.channels[i];
             channel.bankMSB = 121;
             channel.bankLSB = 0;
             channel.bank = 121 * 128;
+            channel.isDrum = false;
         }
         this.channels[9].bankMSB = 120;
         this.channels[9].bank = 120 * 128;
+        this.channels[9].isDrum = true;
     }
     handleUniversalRealTimeExclusiveMessage(data, scheduleTime) {
         switch (data[2]) {
@@ -2162,8 +2249,14 @@ class MidyGM2 {
         const prev = this.masterFineTuning;
         const next = (value - 8192) / 8.192; // cent
         this.masterFineTuning = next;
-        channel.detune += next - prev;
-        this.updateChannelDetune(channel, scheduleTime);
+        const detuneChange = next - prev;
+        for (let i = 0; i < this.channels.length; i++) {
+            const channel = this.channels[i];
+            if (channel.isDrum)
+                continue;
+            channel.detune += detuneChange;
+            this.updateChannelDetune(channel, scheduleTime);
+        }
     }
     handleMasterCoarseTuningSysEx(data, scheduleTime) {
         const coarseTuning = data[4];
@@ -2173,8 +2266,14 @@ class MidyGM2 {
         const prev = this.masterCoarseTuning;
         const next = (value - 64) * 100; // cent
         this.masterCoarseTuning = next;
-        channel.detune += next - prev;
-        this.updateChannelDetune(channel, scheduleTime);
+        const detuneChange = next - prev;
+        for (let i = 0; i < this.channels.length; i++) {
+            const channel = this.channels[i];
+            if (channel.isDrum)
+                continue;
+            channel.detune += detuneChange;
+            this.updateChannelDetune(channel, scheduleTime);
+        }
     }
     handleGlobalParameterControlSysEx(data, scheduleTime) {
         if (data[7] === 1) {
@@ -2502,13 +2601,20 @@ class MidyGM2 {
     }
     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);
         });
     }
 }
@@ -2519,6 +2625,7 @@ Object.defineProperty(MidyGM2, "channelSettings", {
     writable: true,
     value: {
         currentBufferSource: null,
+        isDrum: false,
         detune: 0,
         program: 0,
         bank: 121 * 128,
@@ -2529,8 +2636,8 @@ Object.defineProperty(MidyGM2, "channelSettings", {
         rpnMSB: 127,
         rpnLSB: 127,
         mono: false, // CC#124, CC#125
+        modulationDepthRange: 50, // cent
         fineTuning: 0, // cb
         coarseTuning: 0, // cb
-        modulationDepthRange: 50, // cent
     }
 });

package/script/midy-GMLite.d.ts

@@ -1,6 +1,7 @@
 export class MidyGMLite {
     static channelSettings: {
         currentBufferSource: null;
+        isDrum: boolean;
         detune: number;
         program: number;
         bank: number;
@@ -8,8 +9,10 @@ export class MidyGMLite {
         dataLSB: number;
         rpnMSB: number;
         rpnLSB: number;
+        modulationDepthRange: number;
     };
     constructor(audioContext: any);
+    mode: string;
     ticksPerBeat: number;
     totalTime: number;
     noteCheckInterval: number;
@@ -32,6 +35,8 @@ export class MidyGMLite {
     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;
@@ -70,7 +75,8 @@ export class MidyGMLite {
     };
     createChannels(audioContext: any): any[];
     createNoteBuffer(voiceParams: any, isSF3: any): Promise<any>;
-    createNoteBufferNode(audioBuffer: any, voiceParams: any): any;
+    calcLoopMode(channel: any, voiceParams: any): boolean;
+    createBufferSource(channel: any, voiceParams: any, audioBuffer: any): any;
     scheduleTimelineEvents(t: any, offset: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
     playNotes(): Promise<any>;
@@ -173,8 +179,8 @@ export class MidyGMLite {
     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-GMLite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAiJA;IAsBE;;;;;;;;;MASE;IAEF,+BAQC;IAxCD,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;IAcrC,kBAAgC;IAChC,kBAA8C;IAC9C;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAWC;IAED,6DA2BC;IAED,8DASC;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,wCAIC;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,sEAUC;IAED,mEAQC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MA2BC;IAED,oFAMC;IAED,6EA2CC;IAED;;;;;;;;;;;;;MAeC;IAED,kGAWC;IAED,wDAWC;IAED,iFAKC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,uDAYC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,gFAGC;IAED,8CAqBC;IAED,gFAGC;IAED,gFAgBC;IAED,oBAMC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAED,6DAUC;CACF;AAj3CD;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-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AAiJA;IAuBE;;;;;;;;;;;MAWE;IAEF,+BAcC;IAjDD,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;IAgBrC,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,sDAMC;IAED,0EASC;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,wCAIC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,yGAgBC;IAED,gHA4CC;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,uDAYC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAWC;IAED,gFAGC;IAED,8CAqBC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAED,6DAgBC;CACF;AAp5CD;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-GMLite.js

@@ -173,6 +173,12 @@ const volumeEnvelopeKeys = [
 const volumeEnvelopeKeySet = new Set(volumeEnvelopeKeys);
 class MidyGMLite {
     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 MidyGMLite {
         });
         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() {
@@ -392,10 +404,18 @@ class MidyGMLite {
             return audioBuffer;
         }
     }
-    createNoteBufferNode(audioBuffer, voiceParams) {
+    calcLoopMode(channel, voiceParams) {
+        if (channel.isDrum) {
+            return false;
+        }
+        else {
+            return voiceParams.sampleModes % 2 !== 0;
+        }
+    }
+    createBufferSource(channel, voiceParams, audioBuffer) {
         const bufferSource = new AudioBufferSourceNode(this.audioContext);
         bufferSource.buffer = audioBuffer;
-        bufferSource.loop = voiceParams.sampleModes % 2 !== 0;
+        bufferSource.loop = this.calcLoopMode(channel, voiceParams);
         if (bufferSource.loop) {
             bufferSource.loopStart = voiceParams.loopStart / voiceParams.sampleRate;
             bufferSource.loopEnd = voiceParams.loopEnd / voiceParams.sampleRate;
@@ -806,7 +826,7 @@ class MidyGMLite {
         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(channel, voiceParams, audioBuffer);
         note.volumeEnvelopeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
             type: "lowpass",
@@ -845,7 +865,7 @@ class MidyGMLite {
             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, true);
                 }
@@ -953,8 +973,10 @@ class MidyGMLite {
         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;
@@ -1103,7 +1125,6 @@ class MidyGMLite {
         }
     }
     updateModulation(channel, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const depth = channel.state.modulationDepth * channel.modulationDepthRange;
         this.processScheduledNotes(channel, (note) => {
             if (note.modulationDepth) {
@@ -1116,8 +1137,10 @@ class MidyGMLite {
         });
     }
     setModulationDepth(channelNumber, modulation, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.modulationDepth = modulation / 127;
         this.updateModulation(channel, scheduleTime);
     }
@@ -1162,8 +1185,10 @@ class MidyGMLite {
             .setValueAtTime(volume * gainRight, scheduleTime);
     }
     setSustainPedal(channelNumber, value, scheduleTime) {
-        scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
+        if (channel.isDrum)
+            return;
+        scheduleTime ??= this.audioContext.currentTime;
         channel.state.sustainPedal = value / 127;
         if (64 <= value) {
             this.processScheduledNotes(channel, (note) => {
@@ -1220,8 +1245,10 @@ class MidyGMLite {
         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;
@@ -1260,12 +1287,12 @@ class MidyGMLite {
         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;
@@ -1277,12 +1304,17 @@ class MidyGMLite {
                 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]) {
@@ -1325,13 +1357,20 @@ class MidyGMLite {
     }
     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);
         });
     }
 }
@@ -1342,6 +1381,7 @@ Object.defineProperty(MidyGMLite, "channelSettings", {
     writable: true,
     value: {
         currentBufferSource: null,
+        isDrum: false,
         detune: 0,
         program: 0,
         bank: 0,
@@ -1349,5 +1389,6 @@ Object.defineProperty(MidyGMLite, "channelSettings", {
         dataLSB: 0,
         rpnMSB: 127,
         rpnLSB: 127,
+        modulationDepthRange: 50, // cent
     }
 });