@marmooo/midy 0.3.5 → 0.3.6

package/script/midy-GM2.js

@@ -71,13 +71,13 @@ class Note {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "reverbEffectsSend", {
+        Object.defineProperty(this, "reverbSend", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "chorusEffectsSend", {
+        Object.defineProperty(this, "chorusSend", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -365,17 +365,17 @@ class MidyGM2 {
             writable: true,
             value: []
         });
-        Object.defineProperty(this, "instruments", {
+        Object.defineProperty(this, "notePromises", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: []
         });
-        Object.defineProperty(this, "notePromises", {
+        Object.defineProperty(this, "instruments", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: []
+            value: new Set()
         });
         Object.defineProperty(this, "exclusiveClassNotes", {
             enumerable: true,
@@ -507,7 +507,7 @@ class MidyGM2 {
         const soundFont = this.soundFonts[soundFontIndex];
         const voice = soundFont.getVoice(bankNumber, channel.programNumber, noteNumber, velocity);
         const { instrument, sampleID } = voice.generators;
-        return `${soundFontIndex}:${instrument}:${sampleID}`;
+        return soundFontIndex * (2 ** 32) + (instrument << 16) + sampleID;
     }
     createChannelAudioNodes(audioContext) {
         const { gainLeft, gainRight } = this.panToGain(defaultControllerState.pan.defaultValue);
@@ -907,13 +907,11 @@ class MidyGM2 {
         return impulse;
     }
     createConvolutionReverb(audioContext, impulse) {
-        const input = new GainNode(audioContext);
         const convolverNode = new ConvolverNode(audioContext, {
             buffer: impulse,
         });
-        input.connect(convolverNode);
         return {
-            input,
+            input: convolverNode,
             output: convolverNode,
             convolverNode,
         };
@@ -1343,12 +1341,8 @@ class MidyGM2 {
         }
         note.bufferSource.connect(note.filterNode);
         note.filterNode.connect(note.volumeEnvelopeNode);
-        if (0 < state.chorusSendLevel) {
-            this.setChorusEffectsSend(channel, note, 0, now);
-        }
-        if (0 < state.reverbSendLevel) {
-            this.setReverbEffectsSend(channel, note, 0, now);
-        }
+        this.setChorusSend(channel, note, now);
+        this.setReverbSend(channel, note, now);
         note.bufferSource.start(startTime);
         return note;
     }
@@ -1414,10 +1408,14 @@ class MidyGM2 {
             return;
         const note = await this.createNote(channel, voice, noteNumber, velocity, startTime);
         if (channel.isDrum) {
-            const audioContext = this.audioContext;
-            const { gainL, gainR } = this.createChannelAudioNodes(audioContext);
-            channel.keyBasedGainLs[noteNumber] = gainL;
-            channel.keyBasedGainRs[noteNumber] = gainR;
+            const { keyBasedGainLs, keyBasedGainRs } = channel;
+            let gainL = keyBasedGainLs[noteNumber];
+            let gainR = keyBasedGainRs[noteNumber];
+            if (!gainL) {
+                const audioNodes = this.createChannelAudioNodes(this.audioContext);
+                gainL = keyBasedGainLs[noteNumber] = audioNodes.gainL;
+                gainR = keyBasedGainRs[noteNumber] = audioNodes.gainR;
+            }
             note.volumeEnvelopeNode.connect(gainL);
             note.volumeEnvelopeNode.connect(gainR);
         }
@@ -1451,11 +1449,11 @@ class MidyGM2 {
             note.vibratoDepth.disconnect();
             note.vibratoLFO.stop();
         }
-        if (note.reverbEffectsSend) {
-            note.reverbEffectsSend.disconnect();
+        if (note.reverbSend) {
+            note.reverbSend.disconnect();
         }
-        if (note.chorusEffectsSend) {
-            note.chorusEffectsSend.disconnect();
+        if (note.chorusSend) {
+            note.chorusSend.disconnect();
         }
     }
     releaseNote(channel, note, endTime) {
@@ -1606,7 +1604,7 @@ class MidyGM2 {
         }
         const table = channel.channelPressureTable;
         this.processActiveNotes(channel, scheduleTime, (note) => {
-            this.setControllerParameters(channel, note, table);
+            this.setEffects(channel, note, table);
         });
         this.applyVoiceParams(channel, 13);
     }
@@ -1628,13 +1626,18 @@ class MidyGM2 {
         this.applyVoiceParams(channel, 14, scheduleTime);
     }
     setModLfoToPitch(channel, note, scheduleTime) {
-        const modLfoToPitch = note.voiceParams.modLfoToPitch +
-            this.getLFOPitchDepth(channel);
-        const baseDepth = Math.abs(modLfoToPitch) + channel.state.modulationDepth;
-        const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
-        note.modulationDepth.gain
-            .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(modulationDepth, scheduleTime);
+        if (note.modulationDepth) {
+            const modLfoToPitch = note.voiceParams.modLfoToPitch +
+                this.getLFOPitchDepth(channel, note);
+            const baseDepth = Math.abs(modLfoToPitch) + channel.state.modulationDepth;
+            const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
+            note.modulationDepth.gain
+                .cancelScheduledValues(scheduleTime)
+                .setValueAtTime(modulationDepth, scheduleTime);
+        }
+        else {
+            this.startModulation(channel, note, scheduleTime);
+        }
     }
     setVibLfoToPitch(channel, note, scheduleTime) {
         const vibLfoToPitch = note.voiceParams.vibLfoToPitch;
@@ -1661,63 +1664,63 @@ class MidyGM2 {
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(volumeDepth, scheduleTime);
     }
-    setReverbEffectsSend(channel, note, prevValue, scheduleTime) {
-        let value = note.voiceParams.reverbEffectsSend;
+    setReverbSend(channel, note, scheduleTime) {
+        let value = note.voiceParams.reverbEffectsSend *
+            channel.state.reverbSendLevel;
         if (channel.isDrum) {
             const keyBasedValue = this.getKeyBasedValue(channel, note.noteNumber, 91);
-            if (0 <= keyBasedValue) {
-                value *= keyBasedValue / 127 / channel.state.reverbSendLevel;
-            }
+            if (0 <= keyBasedValue)
+                value = keyBasedValue / 127;
         }
-        if (0 < prevValue) {
+        if (!note.reverbSend) {
             if (0 < value) {
-                note.reverbEffectsSend.gain
-                    .cancelScheduledValues(scheduleTime)
-                    .setValueAtTime(value, scheduleTime);
-            }
-            else {
-                note.reverbEffectsSend.disconnect();
+                note.reverbSend = new GainNode(this.audioContext, { gain: value });
+                note.volumeEnvelopeNode.connect(note.reverbSend);
+                note.reverbSend.connect(this.reverbEffect.input);
             }
         }
         else {
+            note.reverbSend.gain
+                .cancelScheduledValues(scheduleTime)
+                .setValueAtTime(value, scheduleTime);
             if (0 < value) {
-                if (!note.reverbEffectsSend) {
-                    note.reverbEffectsSend = new GainNode(this.audioContext, {
-                        gain: value,
-                    });
-                    note.volumeNode.connect(note.reverbEffectsSend);
+                note.volumeEnvelopeNode.connect(note.reverbSend);
+            }
+            else {
+                try {
+                    note.volumeEnvelopeNode.disconnect(note.reverbSend);
                 }
-                note.reverbEffectsSend.connect(this.reverbEffect.input);
+                catch { /* empty */ }
             }
         }
     }
-    setChorusEffectsSend(channel, note, prevValue, scheduleTime) {
-        let value = note.voiceParams.chorusEffectsSend;
+    setChorusSend(channel, note, scheduleTime) {
+        let value = note.voiceParams.chorusEffectsSend *
+            channel.state.chorusSendLevel;
         if (channel.isDrum) {
             const keyBasedValue = this.getKeyBasedValue(channel, note.noteNumber, 93);
-            if (0 <= keyBasedValue) {
-                value *= keyBasedValue / 127 / channel.state.chorusSendLevel;
-            }
+            if (0 <= keyBasedValue)
+                value = keyBasedValue / 127;
         }
-        if (0 < prevValue) {
+        if (!note.chorusSend) {
             if (0 < value) {
-                note.chorusEffectsSend.gain
-                    .cancelScheduledValues(scheduleTime)
-                    .setValueAtTime(value, scheduleTime);
-            }
-            else {
-                note.chorusEffectsSend.disconnect();
+                note.chorusSend = new GainNode(this.audioContext, { gain: value });
+                note.volumeEnvelopeNode.connect(note.chorusSend);
+                note.chorusSend.connect(this.chorusEffect.input);
             }
         }
         else {
+            note.chorusSend.gain
+                .cancelScheduledValues(scheduleTime)
+                .setValueAtTime(value, scheduleTime);
             if (0 < value) {
-                if (!note.chorusEffectsSend) {
-                    note.chorusEffectsSend = new GainNode(this.audioContext, {
-                        gain: value,
-                    });
-                    note.volumeEnvelopeNode.connect(note.chorusEffectsSend);
+                note.volumeEnvelopeNode.connect(note.chorusSend);
+            }
+            else {
+                try {
+                    note.volumeEnvelopeNode.disconnect(note.chorusSend);
                 }
-                note.chorusEffectsSend.connect(this.chorusEffect.input);
+                catch { /* empty */ }
             }
         }
     }
@@ -1866,7 +1869,7 @@ class MidyGM2 {
             handler.call(this, channelNumber, value, scheduleTime);
             const channel = this.channels[channelNumber];
             this.applyVoiceParams(channel, controllerType + 128, scheduleTime);
-            this.applyControlTable(channel, controllerType, scheduleTime);
+            this.setControlChangeEffects(channel, controllerType, scheduleTime);
         }
         else {
             console.warn(`Unsupported Control change: controllerType=${controllerType} value=${value}`);
@@ -1882,7 +1885,6 @@ class MidyGM2 {
                 note.modulationDepth.gain.setValueAtTime(depth, scheduleTime);
             }
             else {
-                this.setPitchEnvelope(note, scheduleTime);
                 this.startModulation(channel, note, scheduleTime);
             }
         });
@@ -1927,8 +1929,14 @@ class MidyGM2 {
         scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.state.volume = volume / 127;
-        this.updateChannelVolume(channel, scheduleTime);
-        this.updateKeyBasedVolume(channel, scheduleTime);
+        if (channel.isDrum) {
+            for (let i = 0; i < 128; i++) {
+                this.updateKeyBasedVolume(channel, i, scheduleTime);
+            }
+        }
+        else {
+            this.updateChannelVolume(channel, scheduleTime);
+        }
     }
     panToGain(pan) {
         const theta = Math.PI / 2 * Math.max(0, pan * 127 - 1) / 126;
@@ -1941,8 +1949,14 @@ class MidyGM2 {
         scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.state.pan = pan / 127;
-        this.updateChannelVolume(channel, scheduleTime);
-        this.updateKeyBasedVolume(channel, scheduleTime);
+        if (channel.isDrum) {
+            for (let i = 0; i < 128; i++) {
+                this.updateKeyBasedVolume(channel, i, scheduleTime);
+            }
+        }
+        else {
+            this.updateChannelVolume(channel, scheduleTime);
+        }
     }
     setExpression(channelNumber, expression, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
@@ -1968,33 +1982,27 @@ class MidyGM2 {
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(volume * gainRight, scheduleTime);
     }
-    updateKeyBasedVolume(channel, scheduleTime) {
-        if (!channel.isDrum)
-            return;
+    updateKeyBasedVolume(channel, keyNumber, scheduleTime) {
         const state = channel.state;
         const defaultVolume = state.volume * state.expression;
         const defaultPan = state.pan;
-        for (let i = 0; i < 128; i++) {
-            const gainL = channel.keyBasedGainLs[i];
-            const gainR = channel.keyBasedGainLs[i];
-            if (!gainL)
-                continue;
-            if (!gainR)
-                continue;
-            const keyBasedVolume = this.getKeyBasedValue(channel, i, 7);
-            const volume = (0 <= keyBasedVolume)
-                ? defaultVolume * keyBasedVolume / 64
-                : defaultVolume;
-            const keyBasedPan = this.getKeyBasedValue(channel, i, 10);
-            const pan = (0 <= keyBasedPan) ? keyBasedPan / 127 : defaultPan;
-            const { gainLeft, gainRight } = this.panToGain(pan);
-            gainL.gain
-                .cancelScheduledValues(scheduleTime)
-                .setValueAtTime(volume * gainLeft, scheduleTime);
-            gainR.gain
-                .cancelScheduledValues(scheduleTime)
-                .setValueAtTime(volume * gainRight, scheduleTime);
-        }
+        const gainL = channel.keyBasedGainLs[keyNumber];
+        const gainR = channel.keyBasedGainRs[keyNumber];
+        if (!gainL)
+            return;
+        const keyBasedVolume = this.getKeyBasedValue(channel, keyNumber, 7);
+        const volume = (0 <= keyBasedVolume)
+            ? defaultVolume * keyBasedVolume / 64
+            : defaultVolume;
+        const keyBasedPan = this.getKeyBasedValue(channel, keyNumber, 10);
+        const pan = (0 <= keyBasedPan) ? keyBasedPan / 127 : defaultPan;
+        const { gainLeft, gainRight } = this.panToGain(pan);
+        gainL.gain
+            .cancelScheduledValues(scheduleTime)
+            .setValueAtTime(volume * gainLeft, scheduleTime);
+        gainR.gain
+            .cancelScheduledValues(scheduleTime)
+            .setValueAtTime(volume * gainRight, scheduleTime);
     }
     setSustainPedal(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
@@ -2061,67 +2069,19 @@ class MidyGM2 {
         scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const state = channel.state;
-        const reverbEffect = this.reverbEffect;
-        if (0 < state.reverbSendLevel) {
-            if (0 < reverbSendLevel) {
-                state.reverbSendLevel = reverbSendLevel / 127;
-                reverbEffect.input.gain
-                    .cancelScheduledValues(scheduleTime)
-                    .setValueAtTime(state.reverbSendLevel, scheduleTime);
-            }
-            else {
-                this.processScheduledNotes(channel, (note) => {
-                    if (note.voiceParams.reverbEffectsSend <= 0)
-                        return false;
-                    if (note.reverbEffectsSend)
-                        note.reverbEffectsSend.disconnect();
-                });
-            }
-        }
-        else {
-            if (0 < reverbSendLevel) {
-                this.processScheduledNotes(channel, (note) => {
-                    this.setReverbEffectsSend(channel, note, 0, scheduleTime);
-                });
-                state.reverbSendLevel = reverbSendLevel / 127;
-                reverbEffect.input.gain
-                    .cancelScheduledValues(scheduleTime)
-                    .setValueAtTime(state.reverbSendLevel, scheduleTime);
-            }
-        }
+        state.reverbSendLevel = reverbSendLevel / 127;
+        this.processScheduledNotes(channel, (note) => {
+            this.setReverbSend(channel, note, scheduleTime);
+        });
     }
     setChorusSendLevel(channelNumber, chorusSendLevel, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         const state = channel.state;
-        const chorusEffect = this.chorusEffect;
-        if (0 < state.chorusSendLevel) {
-            if (0 < chorusSendLevel) {
-                state.chorusSendLevel = chorusSendLevel / 127;
-                chorusEffect.input.gain
-                    .cancelScheduledValues(scheduleTime)
-                    .setValueAtTime(state.chorusSendLevel, scheduleTime);
-            }
-            else {
-                this.processScheduledNotes(channel, (note) => {
-                    if (note.voiceParams.chorusEffectsSend <= 0)
-                        return false;
-                    if (note.chorusEffectsSend)
-                        note.chorusEffectsSend.disconnect();
-                });
-            }
-        }
-        else {
-            if (0 < chorusSendLevel) {
-                this.processScheduledNotes(channel, (note) => {
-                    this.setChorusEffectsSend(channel, note, 0, scheduleTime);
-                });
-                state.chorusSendLevel = chorusSendLevel / 127;
-                chorusEffect.input.gain
-                    .cancelScheduledValues(scheduleTime)
-                    .setValueAtTime(state.chorusSendLevel, scheduleTime);
-            }
-        }
+        state.chorusSendLevel = chorusSendLevel / 127;
+        this.processScheduledNotes(channel, (note) => {
+            this.setChorusSend(channel, note, scheduleTime);
+        });
     }
     limitData(channel, minMSB, maxMSB, minLSB, maxLSB) {
         if (maxLSB < channel.dataLSB) {
@@ -2403,9 +2363,9 @@ class MidyGM2 {
             case 9:
                 switch (data[3]) {
                     case 1: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca22.pdf
-                        return this.handlePressureSysEx(data, "channelPressureTable");
+                        return this.handlePressureSysEx(data, "channelPressureTable", scheduleTime);
                     case 3: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca22.pdf
-                        return this.handleControlChangeSysEx(data);
+                        return this.handleControlChangeSysEx(data, scheduleTime);
                     default:
                         console.warn(`Unsupported Exclusive Message: ${data}`);
                 }
@@ -2724,9 +2684,9 @@ class MidyGM2 {
             : 0;
         return channelPressure / 127;
     }
-    setControllerParameters(channel, note, table, scheduleTime) {
+    setEffects(channel, note, table, scheduleTime) {
         if (0 <= table[0])
-            this.updateDetune(channel, note, scueduleTime);
+            this.updateDetune(channel, note, scheduleTime);
         if (0.5 <= channel.state.portamemento && 0 <= note.portamentoNoteNumber) {
             if (0 <= table[1]) {
                 this.setPortamentoFilterEnvelope(channel, note, scheduleTime);
@@ -2748,7 +2708,7 @@ class MidyGM2 {
         if (0 <= table[5])
             this.setModLfoToVolume(channel, note, scheduleTime);
     }
-    handlePressureSysEx(data, tableName) {
+    handlePressureSysEx(data, tableName, scheduleTime) {
         const channelNumber = data[4];
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
@@ -2759,32 +2719,38 @@ class MidyGM2 {
             const rr = data[i + 1];
             table[pp] = rr;
         }
+        this.processActiveNotes(channel, scheduleTime, (note) => {
+            this.setEffects(channel, note, table, scheduleTime);
+        });
     }
     initControlTable() {
         const ccCount = 128;
         const slotSize = 6;
         return new Int8Array(ccCount * slotSize).fill(-1);
     }
-    applyControlTable(channel, controllerType, scheduleTime) {
+    setControlChangeEffects(channel, controllerType, scheduleTime) {
         const slotSize = 6;
         const offset = controllerType * slotSize;
         const table = channel.controlTable.subarray(offset, offset + slotSize);
         this.processScheduledNotes(channel, (note) => {
-            this.setControllerParameters(channel, note, table, scheduleTime);
+            this.setEffects(channel, note, table, scheduleTime);
         });
     }
-    handleControlChangeSysEx(data) {
+    handleControlChangeSysEx(data, scheduleTime) {
         const channelNumber = data[4];
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
+        const slotSize = 6;
         const controllerType = data[5];
-        const table = channel.controlTable[controllerType];
-        for (let i = 6; i < data.length - 1; i += 2) {
+        const offset = controllerType * slotSize;
+        const table = channel.controlTable;
+        for (let i = 6; i < data.length; i += 2) {
             const pp = data[i];
             const rr = data[i + 1];
-            table[pp] = rr;
+            table[offset + pp] = rr;
         }
+        this.setControlChangeEffects(channel, controllerType, scheduleTime);
     }
     getKeyBasedValue(channel, keyNumber, controllerType) {
         const index = keyNumber * 128 + controllerType;
@@ -2798,13 +2764,20 @@ class MidyGM2 {
             return;
         const keyNumber = data[5];
         const table = channel.keyBasedInstrumentControlTable;
-        for (let i = 6; i < data.length - 1; i += 2) {
+        for (let i = 6; i < data.length; i += 2) {
             const controllerType = data[i];
             const value = data[i + 1];
             const index = keyNumber * 128 + controllerType;
             table[index] = value;
+            switch (controllerType) {
+                case 7:
+                case 10:
+                    this.updateKeyBasedVolume(channel, keyNumber, scheduleTime);
+                    break;
+                default: // TODO
+                    this.setControlChange(channelNumber, controllerType, value, scheduleTime);
+            }
         }
-        this.setChannelPressure(channelNumber, channel.state.channelPressure * 127, scheduleTime);
     }
     handleSysEx(data, scheduleTime) {
         switch (data[0]) {

package/script/midy-GMLite.d.ts

@@ -30,8 +30,8 @@ export class MidyGMLite {
     isStopping: boolean;
     isSeeking: boolean;
     timeline: any[];
-    instruments: any[];
     notePromises: any[];
+    instruments: Set<any>;
     exclusiveClassNotes: any[];
     drumExclusiveClassNotes: any[];
     audioContext: any;
@@ -58,7 +58,7 @@ export class MidyGMLite {
     loadSoundFont(input: any): Promise<void>;
     loadMIDI(input: any): Promise<void>;
     cacheVoiceIds(): void;
-    getVoiceId(channel: any, noteNumber: any, velocity: any): string | undefined;
+    getVoiceId(channel: any, noteNumber: any, velocity: any): any;
     createChannelAudioNodes(audioContext: any): {
         gainL: any;
         gainR: any;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AA0GA;IA2BE;;;;;;;;;;MAUE;IAEF,+BAcC;IApDD,aAAa;IACb,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,4BAAyB;IACzB,0BAAuB;IACvB,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IAClB,2BAAqC;IACrC,+BAEE;IAeA,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,gBAAiD;IAMnD,4BAMC;IAED,mCASC;IAED,2DAYC;IAED,yCAmBC;IAED,oCASC;IAED,sBAoCC;IAED,6EAcC;IAED;;;;MAeC;IAED,yCAaC;IAED,kDAUC;IAED,0EAUC;IAED,+EAkDC;IAED,mCAOC;IAED,0BAiEC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,kGAeC;IAED,mGAeC;IAED,wEAMC;IAED,uBAMC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,yDAQC;IAED,yEASC;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,6FAyBC;IAED,oGAuCC;IAED,0EAiBC;IAED,8EAiBC;IAED,kGAoCC;IAED,6FASC;IAED,gCASC;IAED,iEAoBC;IAED,qGAkBC;IAED,6CAUC;IAED,qDAUC;IAED,qFASC;IAED,sFAeC;IAED,oGA2BC;IAED,mFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAQC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MA2BC;IAED,oFAMC;IAED,6EAgCC;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,uDAYC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,gFAGC;IAED,yCAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAGD,6DAgBC;CACF;AAt/CD;IAWE,0FAMC;IAhBD,cAAW;IACX,gBAAe;IACf,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":"AA0GA;IA2BE;;;;;;;;;;MAUE;IAEF,+BAcC;IApDD,aAAa;IACb,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,4BAAyB;IACzB,0BAAuB;IACvB,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,oBAAkB;IAClB,sBAAwB;IACxB,2BAAqC;IACrC,+BAEE;IAeA,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,gBAAiD;IAMnD,4BAMC;IAED,mCASC;IAED,2DAYC;IAED,yCAmBC;IAED,oCASC;IAED,sBAoCC;IAED,8DAcC;IAED;;;;MAeC;IAED,yCAaC;IAED,kDAUC;IAED,0EAUC;IAED,+EAkDC;IAED,mCAOC;IAED,0BAiEC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,kGAeC;IAED,mGAeC;IAED,wEAMC;IAED,uBAMC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,yDAQC;IAED,yEASC;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,6FAyBC;IAED,oGAuCC;IAED,0EAiBC;IAED,8EAiBC;IAED,kGAoCC;IAED,6FASC;IAED,gCASC;IAED,iEAoBC;IAED,qGAkBC;IAED,6CAUC;IAED,qDAUC;IAED,qFASC;IAED,sFAeC;IAED,oGA2BC;IAED,mFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAWC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MA2BC;IAED,oFAMC;IAED,6EAgCC;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,uDAYC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,gFAGC;IAED,yCAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAGD,6DAgBC;CACF;AAx/CD;IAWE,0FAMC;IAhBD,cAAW;IACX,gBAAe;IACf,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

@@ -266,17 +266,17 @@ class MidyGMLite {
             writable: true,
             value: []
         });
-        Object.defineProperty(this, "instruments", {
+        Object.defineProperty(this, "notePromises", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: []
         });
-        Object.defineProperty(this, "notePromises", {
+        Object.defineProperty(this, "instruments", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: []
+            value: new Set()
         });
         Object.defineProperty(this, "exclusiveClassNotes", {
             enumerable: true,
@@ -404,7 +404,7 @@ class MidyGMLite {
         const soundFont = this.soundFonts[soundFontIndex];
         const voice = soundFont.getVoice(bankNumber, channel.programNumber, noteNumber, velocity);
         const { instrument, sampleID } = voice.generators;
-        return `${soundFontIndex}:${instrument}:${sampleID}`;
+        return soundFontIndex * (2 ** 32) + (instrument << 16) + sampleID;
     }
     createChannelAudioNodes(audioContext) {
         const { gainLeft, gainRight } = this.panToGain(defaultControllerState.pan.defaultValue);
@@ -1058,13 +1058,17 @@ class MidyGMLite {
         this.applyVoiceParams(channel, 14, scheduleTime);
     }
     setModLfoToPitch(channel, note, scheduleTime) {
-        const modLfoToPitch = note.voiceParams.modLfoToPitch;
-        const baseDepth = Math.abs(modLfoToPitch) +
-            channel.state.modulationDepth;
-        const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
-        note.modulationDepth.gain
-            .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(modulationDepth, scheduleTime);
+        if (note.modulationDepth) {
+            const modLfoToPitch = note.voiceParams.modLfoToPitch;
+            const baseDepth = Math.abs(modLfoToPitch) + channel.state.modulationDepth;
+            const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
+            note.modulationDepth.gain
+                .cancelScheduledValues(scheduleTime)
+                .setValueAtTime(modulationDepth, scheduleTime);
+        }
+        else {
+            this.startModulation(channel, note, scheduleTime);
+        }
     }
     setModLfoToFilterFc(note, scheduleTime) {
         const modLfoToFilterFc = note.voiceParams.modLfoToFilterFc;
@@ -1193,7 +1197,6 @@ class MidyGMLite {
                 note.modulationDepth.gain.setValueAtTime(depth, scheduleTime);
             }
             else {
-                this.setPitchEnvelope(note, scheduleTime);
                 this.startModulation(channel, note, scheduleTime);
             }
         });