@marmooo/midy 0.4.7 → 0.4.9

package/esm/midy-GMLite.js

@@ -92,6 +92,88 @@ class Note {
         });
     }
 }
+class Channel {
+    constructor(audioNodes, settings) {
+        Object.defineProperty(this, "isDrum", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "programNumber", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "scheduleIndex", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "detune", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "dataMSB", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "dataLSB", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "rpnMSB", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 127
+        });
+        Object.defineProperty(this, "rpnLSB", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 127
+        });
+        Object.defineProperty(this, "modulationDepthRange", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 50
+        }); // cent
+        Object.defineProperty(this, "scheduledNotes", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "sustainNotes", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "currentBufferSource", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+        Object.assign(this, audioNodes);
+        Object.assign(this, settings);
+        this.state = new ControllerState();
+    }
+    resetSettings(settings) {
+        Object.assign(this, settings);
+    }
+}
 const drumExclusiveClasses = new Uint8Array(128);
 drumExclusiveClasses[42] = 1;
 drumExclusiveClasses[44] = 1;
@@ -495,18 +577,8 @@ export class MidyGMLite extends EventTarget {
         };
     }
     createChannels(audioContext) {
-        const channels = Array.from({ length: this.numChannels }, () => {
-            return {
-                currentBufferSource: null,
-                isDrum: false,
-                state: new ControllerState(),
-                ...this.constructor.channelSettings,
-                ...this.createChannelAudioNodes(audioContext),
-                scheduledNotes: [],
-                sustainNotes: [],
-            };
-        });
-        return channels;
+        const settings = this.constructor.channelSettings;
+        return Array.from({ length: this.numChannels }, () => new Channel(this.createChannelAudioNodes(audioContext), settings));
     }
     decodeOggVorbis(sample) {
         const task = decoderQueue.then(async () => {
@@ -1612,9 +1684,7 @@ export class MidyGMLite extends EventTarget {
                 state[key] = defaultValue;
             }
         }
-        for (const key of Object.keys(this.constructor.channelSettings)) {
-            channel[key] = this.constructor.channelSettings[key];
-        }
+        channel.resetSettings(this.constructor.channelSettings);
         this.mode = "GM1";
     }
     // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/rp15.pdf

package/esm/midy.d.ts

@@ -96,7 +96,7 @@ export class Midy extends EventTarget {
     controlChangeHandlers: any[];
     keyBasedControllerHandlers: any[];
     effectHandlers: any[];
-    channels: any[];
+    channels: Channel[];
     reverbEffect: {
         input: any;
         output: any;
@@ -121,8 +121,7 @@ export class Midy extends EventTarget {
         gainR: any;
         merger: any;
     };
-    resetChannelTable(channel: any): void;
-    createChannels(audioContext: any): any[];
+    createChannels(audioContext: any): Channel[];
     decodeOggVorbis(sample: any): Promise<any>;
     createAudioBuffer(voiceParams: any): Promise<any>;
     isLoopDrum(channel: any, noteNumber: any): boolean;
@@ -260,6 +259,7 @@ export class Midy extends EventTarget {
     updatePortamento(channel: any, scheduleTime: any): void;
     setPortamentoTime(channelNumber: any, value: any, scheduleTime: any): void;
     setVolume(channelNumber: any, value: any, scheduleTime: any): void;
+    applyVolume(channel: any, scheduleTime: any): void;
     panToGain(pan: any): {
         gainLeft: number;
         gainRight: number;
@@ -363,7 +363,11 @@ export class Midy extends EventTarget {
     getLFOAmplitudeDepth(channel: any, note: any): number;
     createEffectHandlers(): any[];
     setControlChangeEffects(channel: any, note: any, scheduleTime: any): void;
+    setChannelPressureEffects(channel: any, note: any, scheduleTime: any): void;
+    setPolyphonicKeyPressureEffects(channel: any, note: any, scheduleTime: any): void;
     setPressureEffects(channel: any, note: any, tableName: any, scheduleTime: any): void;
+    handleChannelPressureSysEx(data: any, scheduleTime: any): void;
+    handlePolyphonicKeyPressureSysEx(data: any, scheduleTime: any): void;
     handlePressureSysEx(data: any, tableName: any, scheduleTime: any): void;
     handleControlChangeSysEx(data: any, scheduleTime: any): void;
     getRelativeKeyBasedValue(channel: any, keyNumber: any, controllerType: any): any;
@@ -374,6 +378,37 @@ export class Midy extends EventTarget {
     scheduleTask(callback: any, scheduleTime: any): Promise<any>;
 }
 import { OggVorbisDecoderWebWorker } from "@wasm-audio-decoders/ogg-vorbis";
+declare class Channel {
+    constructor(audioNodes: any, settings: any);
+    isDrum: boolean;
+    programNumber: number;
+    scheduleIndex: number;
+    detune: number;
+    bankMSB: number;
+    bankLSB: number;
+    dataMSB: number;
+    dataLSB: number;
+    rpnMSB: number;
+    rpnLSB: number;
+    mono: boolean;
+    modulationDepthRange: number;
+    fineTuning: number;
+    coarseTuning: number;
+    scheduledNotes: any[];
+    sustainNotes: any[];
+    sostenutoNotes: any[];
+    controlTable: Int8Array<ArrayBuffer>;
+    scaleOctaveTuningTable: Float32Array<ArrayBuffer>;
+    channelPressureTable: Int8Array<ArrayBuffer>;
+    polyphonicKeyPressureTable: Int8Array<ArrayBuffer>;
+    keyBasedTable: Int8Array<ArrayBuffer>;
+    keyBasedGainLs: any[];
+    keyBasedGainRs: any[];
+    currentBufferSource: null;
+    state: ControllerState;
+    resetSettings(settings: any): void;
+    resetTable(channel: any): void;
+}
 declare class Note {
     constructor(noteNumber: any, velocity: any, startTime: any);
     voice: any;
@@ -401,5 +436,8 @@ declare class Note {
     ready: Promise<any>;
     resolveReady: (value: any) => void;
 }
+declare class ControllerState {
+    array: Float32Array<ArrayBuffer>;
+}
 export {};
 //# sourceMappingURL=midy.d.ts.map

package/esm/midy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"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"}

package/esm/midy.js

@@ -134,6 +134,173 @@ class Note {
         });
     }
 }
+class Channel {
+    constructor(audioNodes, settings) {
+        Object.defineProperty(this, "isDrum", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "programNumber", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "scheduleIndex", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "detune", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "bankMSB", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 121
+        });
+        Object.defineProperty(this, "bankLSB", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "dataMSB", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "dataLSB", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        Object.defineProperty(this, "rpnMSB", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 127
+        });
+        Object.defineProperty(this, "rpnLSB", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 127
+        });
+        Object.defineProperty(this, "mono", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        }); // CC#124, CC#125
+        Object.defineProperty(this, "modulationDepthRange", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 50
+        }); // cent
+        Object.defineProperty(this, "fineTuning", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        }); // cent
+        Object.defineProperty(this, "coarseTuning", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        }); // cent
+        Object.defineProperty(this, "scheduledNotes", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "sustainNotes", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "sostenutoNotes", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "controlTable", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Int8Array(defaultControlValues)
+        });
+        Object.defineProperty(this, "scaleOctaveTuningTable", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Float32Array(12)
+        }); // [-100, 100] cent
+        Object.defineProperty(this, "channelPressureTable", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Int8Array(defaultPressureValues)
+        });
+        Object.defineProperty(this, "polyphonicKeyPressureTable", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Int8Array(defaultPressureValues)
+        });
+        Object.defineProperty(this, "keyBasedTable", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Int8Array(128 * 128).fill(-1)
+        });
+        Object.defineProperty(this, "keyBasedGainLs", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Array(128)
+        });
+        Object.defineProperty(this, "keyBasedGainRs", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Array(128)
+        });
+        Object.defineProperty(this, "currentBufferSource", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
+        Object.assign(this, audioNodes);
+        Object.assign(this, settings);
+        this.state = new ControllerState();
+    }
+    resetSettings(settings) {
+        Object.assign(this, settings);
+    }
+    resetTable(channel) {
+        channel.controlTable.set(defaultControlValues);
+        channel.scaleOctaveTuningTable.fill(0); // [-100, 100] cent
+        channel.channelPressureTable.set(defaultPressureValues);
+        channel.polyphonicKeyPressureTable.set(defaultPressureValues);
+        channel.keyBasedTable.fill(-1);
+    }
+}
 const drumExclusiveClassesByKit = new Array(57);
 const drumExclusiveClassCount = 10;
 const standardSet = new Uint8Array(128);
@@ -697,34 +864,9 @@ export class Midy extends EventTarget {
             merger,
         };
     }
-    resetChannelTable(channel) {
-        channel.controlTable.set(defaultControlValues);
-        channel.scaleOctaveTuningTable.fill(0); // [-100, 100] cent
-        channel.channelPressureTable.set(defaultPressureValues);
-        channel.polyphonicKeyPressureTable.set(defaultPressureValues);
-        channel.keyBasedTable.fill(-1);
-    }
     createChannels(audioContext) {
-        const channels = Array.from({ length: this.numChannels }, () => {
-            return {
-                currentBufferSource: null,
-                isDrum: false,
-                state: new ControllerState(),
-                ...this.constructor.channelSettings,
-                ...this.createChannelAudioNodes(audioContext),
-                scheduledNotes: [],
-                sustainNotes: [],
-                sostenutoNotes: [],
-                controlTable: new Int8Array(defaultControlValues),
-                scaleOctaveTuningTable: new Float32Array(12), // [-100, 100] cent
-                channelPressureTable: new Int8Array(defaultPressureValues),
-                polyphonicKeyPressureTable: new Int8Array(defaultPressureValues),
-                keyBasedTable: new Int8Array(128 * 128).fill(-1),
-                keyBasedGainLs: new Array(128),
-                keyBasedGainRs: new Array(128),
-            };
-        });
-        return channels;
+        const settings = this.constructor.channelSettings;
+        return Array.from({ length: this.numChannels }, () => new Channel(this.createChannelAudioNodes(audioContext), settings));
     }
     decodeOggVorbis(sample) {
         const task = decoderQueue.then(async () => {
@@ -1783,16 +1925,15 @@ export class Midy extends EventTarget {
     }
     async noteOn(channelNumber, noteNumber, velocity, startTime) {
         if (this.mpeEnabled) {
-            const note = await this.startNote(channelNumber, noteNumber, velocity, startTime);
+            const channel = this.channels[channelNumber];
+            const noteIndex = channel.scheduledNotes.length;
             if (!this.mpeState.channelToNotes.has(channelNumber)) {
                 this.mpeState.channelToNotes.set(channelNumber, new Set());
             }
-            this.mpeState.channelToNotes.get(channelNumber).add(note.index);
-            this.mpeState.noteToChannel.set(note.index, channelNumber);
-        }
-        else {
-            await this.startNote(channelNumber, noteNumber, velocity, startTime);
+            this.mpeState.channelToNotes.get(channelNumber).add(noteIndex);
+            this.mpeState.noteToChannel.set(noteIndex, channelNumber);
         }
+        await this.startNote(channelNumber, noteNumber, velocity, startTime);
     }
     async startNote(channelNumber, noteNumber, velocity, startTime) {
         const channel = this.channels[channelNumber];
@@ -2024,7 +2165,7 @@ export class Midy extends EventTarget {
         this.processActiveNotes(channel, scheduleTime, (note) => {
             if (note.noteNumber === noteNumber) {
                 note.pressure = pressure;
-                this.setPressureEffects(channel, note, scheduleTime);
+                this.setPolyphonicKeyPressureEffects(channel, note, scheduleTime);
             }
         });
         this.applyVoiceParams(channel, 10, scheduleTime);
@@ -2065,7 +2206,7 @@ export class Midy extends EventTarget {
         const next = this.calcChannelPressureEffectValue(channel, 0);
         channel.detune += next - prev;
         this.processActiveNotes(channel, scheduleTime, (note) => {
-            this.setPressureEffects(channel, note, scheduleTime);
+            this.setChannelPressureEffects(channel, note, scheduleTime);
         });
         this.applyVoiceParams(channel, 13, scheduleTime);
     }
@@ -2465,6 +2606,9 @@ export class Midy extends EventTarget {
         const intPart = Math.trunc(value);
         state.volumeMSB = intPart / 127;
         state.volumeLSB = value - intPart;
+        this.applyVolume(channel, scheduleTime);
+    }
+    applyVolume(channel, scheduleTime) {
         if (channel.isDrum) {
             for (let i = 0; i < 128; i++) {
                 this.updateKeyBasedVolume(channel, i, scheduleTime);
@@ -2963,10 +3107,8 @@ export class Midy extends EventTarget {
                 state[key] = defaultValue;
             }
         }
-        for (const key of Object.keys(this.constructor.channelSettings)) {
-            channel[key] = this.constructor.channelSettings[key];
-        }
-        this.resetChannelTable(channel);
+        channel.resetSettings(this.constructor.channelSettings);
+        this.resetTable(channel);
         this.mode = "GM2";
         this.masterFineTuning = 0; // cent
         this.masterCoarseTuning = 0; // cent
@@ -3129,9 +3271,9 @@ export class Midy extends EventTarget {
             case 9:
                 switch (data[3]) {
                     case 1: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca22.pdf
-                        return this.handlePressureSysEx(data, "channelPressureTable", scheduleTime);
+                        return this.handleChannelPressureSysEx(data, scheduelTime);
                     case 2: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca22.pdf
-                        return this.handlePressureSysEx(data, "polyphonicKeyPressureTable", scheduleTime);
+                        return this.handlePolyphonicKeyPressureSysEx(data, scheduleTime);
                     case 3: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca22.pdf
                         return this.handleControlChangeSysEx(data, scheduleTime);
                     default:
@@ -3510,7 +3652,7 @@ export class Midy extends EventTarget {
     }
     createEffectHandlers() {
         const handlers = new Array(6);
-        handlers[0] = (channel, note, scheduleTime) => {
+        handlers[0] = (channel, note, _tableName, scheduleTime) => {
             if (this.isPortamento(channel, note)) {
                 this.setPortamentoDetune(channel, note, scheduleTime);
             }
@@ -3518,7 +3660,7 @@ export class Midy extends EventTarget {
                 this.setDetune(channel, note, scheduleTime);
             }
         };
-        handlers[1] = (channel, note, scheduleTime) => {
+        handlers[1] = (channel, note, _tableName, scheduleTime) => {
             if (0.5 <= channel.state.portamento && 0 <= note.portamentoNoteNumber) {
                 this.setPortamentoFilterEnvelope(channel, note, scheduleTime);
             }
@@ -3526,10 +3668,17 @@ export class Midy extends EventTarget {
                 this.setFilterEnvelope(channel, note, scheduleTime);
             }
         };
-        handlers[2] = (channel, note, scheduleTime) => this.setVolumeNode(channel, note, scheduleTime);
-        handlers[3] = (channel, note, scheduleTime) => this.setModLfoToPitch(channel, note, scheduleTime);
-        handlers[4] = (channel, note, scheduleTime) => this.setModLfoToFilterFc(channel, note, scheduleTime);
-        handlers[5] = (channel, note, scheduleTime) => this.setModLfoToVolume(channel, note, scheduleTime);
+        handlers[2] = (channel, note, tableName, scheduleTime) => {
+            if (tableName === "polyphonicKeyPressureTable") {
+                this.setVolumeNode(channel, note, scheduleTime);
+            }
+            else {
+                this.applyVolume(channel, scheduleTime);
+            }
+        };
+        handlers[3] = (channel, note, _tableName, scheduleTime) => this.setModLfoToPitch(channel, note, scheduleTime);
+        handlers[4] = (channel, note, _tableName, scheduleTime) => this.setModLfoToFilterFc(channel, note, scheduleTime);
+        handlers[5] = (channel, note, _tableName, scheduleTime) => this.setModLfoToVolume(channel, note, scheduleTime);
         return handlers;
     }
     setControlChangeEffects(channel, note, scheduleTime) {
@@ -3539,9 +3688,15 @@ export class Midy extends EventTarget {
             const tableValue = channel.controlTable[i + 6];
             if (baseline === tableValue)
                 continue;
-            handlers[i](channel, note, scheduleTime);
+            handlers[i](channel, note, "controlTable", scheduleTime);
         }
     }
+    setChannelPressureEffects(channel, note, scheduleTime) {
+        this.setPressureEffects(channel, note, "channelPressureTable", scheduleTime);
+    }
+    setPolyphonicKeyPressureEffects(channel, note, scheduleTime) {
+        this.setPressureEffects(channel, note, "polyphonicKeyPressureTable", scheduleTime);
+    }
     setPressureEffects(channel, note, tableName, scheduleTime) {
         const handlers = this.effectHandlers;
         const table = channel[tableName];
@@ -3550,9 +3705,15 @@ export class Midy extends EventTarget {
             const tableValue = table[i];
             if (baseline === tableValue)
                 continue;
-            handlers[i](channel, note, scheduleTime);
+            handlers[i](channel, note, tableName, scheduleTime);
         }
     }
+    handleChannelPressureSysEx(data, scheduleTime) {
+        this.handlePressureSysEx(data, "channelPressureTable", scheduleTime);
+    }
+    handlePolyphonicKeyPressureSysEx(data, scheduleTime) {
+        this.handlePressureSysEx(data, "polyphonicKeyPressureTable", scheduleTime);
+    }
     handlePressureSysEx(data, tableName, scheduleTime) {
         const channelNumber = data[4];
         const channel = this.channels[channelNumber];
@@ -3566,7 +3727,7 @@ export class Midy extends EventTarget {
             const handler = this.effectHandlers[pp];
             this.processActiveNotes(channel, scheduleTime, (note) => {
                 if (handler)
-                    handler(channel, note, scheduleTime);
+                    handler(channel, note, tableName, scheduleTime);
             });
         }
     }
@@ -3586,7 +3747,7 @@ export class Midy extends EventTarget {
             const handler = this.effectHandlers[pp];
             this.processActiveNotes(channel, scheduleTime, (note) => {
                 if (handler)
-                    handler(channel, note, scheduleTime);
+                    handler(channel, note, "controlTable", scheduleTime);
             });
         }
     }

package/package.json

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

@@ -61,7 +61,7 @@ export class MidyGM1 extends EventTarget {
         detune: (channel: any, note: any, scheduleTime: any) => void;
     };
     controlChangeHandlers: any[];
-    channels: any[];
+    channels: Channel[];
     addSoundFont(soundFont: any): void;
     toUint8Array(input: any): Promise<Uint8Array<ArrayBuffer>>;
     loadSoundFont(input: any): Promise<void>;
@@ -73,7 +73,7 @@ export class MidyGM1 extends EventTarget {
         gainR: any;
         merger: any;
     };
-    createChannels(audioContext: any): any[];
+    createChannels(audioContext: any): Channel[];
     decodeOggVorbis(sample: any): Promise<any>;
     createAudioBuffer(voiceParams: any): Promise<any>;
     createBufferSource(voiceParams: any, audioBuffer: any): any;
@@ -189,4 +189,27 @@ export class MidyGM1 extends EventTarget {
     handleSysEx(data: any, scheduleTime: any): void;
     scheduleTask(callback: any, scheduleTime: any): Promise<any>;
 }
+declare class Channel {
+    constructor(audioNodes: any, settings: any);
+    isDrum: boolean;
+    programNumber: number;
+    scheduleIndex: number;
+    detune: number;
+    dataMSB: number;
+    dataLSB: number;
+    rpnMSB: number;
+    rpnLSB: number;
+    modulationDepthRange: number;
+    fineTuning: number;
+    coarseTuning: number;
+    scheduledNotes: any[];
+    sustainNotes: any[];
+    currentBufferSource: null;
+    state: ControllerState;
+    resetSettings(settings: any): void;
+}
+declare class ControllerState {
+    array: Float32Array<ArrayBuffer>;
+}
+export {};
 //# sourceMappingURL=midy-GM1.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAmHA;IAsCE;;;;;;;;;;;MAWE;IAEF,+BAgBC;IA9DD,gCAAgC;IAChC,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,qBAAqC;IACrC,4BAAiC;IACjC,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,iCAEG;IACH,cAAU;IACV,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,sBA6BC;IAED,8DAeC;IAED;;;;MAeC;IAED,yCAaC;IAED,2CAsBC;IAED,kDA6BC;IAED,4DASC;IAED,gEAsDC;IAED,mCASC;IAED,uBAUC;IAED,yDAqCC;IAED,2BA0EC;IAED,uDAEC;IAED,wDAEC;IAED,qCAKC;IAED;;;MAwDC;IAED,kGAeC;IAED,mGAeC;IAED,wEAQC;IAED,uBAMC;IAED,sBAIC;IAED,uBAMC;IAED,wBAIC;IAED,0BAKC;IAED,8BAMC;IAED,wBAYC;IAED,sBAIC;IAED,kEAWC;IAED,kFAYC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,2DAIC;IAED,6CAEC;IAED,sDAeC;IAED,4DASC;IAED,qDAkBC;IAED,6CAIC;IAED,sDA6BC;IAED,kEAqBC;IAED,4GAkCC;IAED,uEAyCC;IAED,0EAiBC;IAED,oEASC;IAED,0FAwBC;IAED,gCASC;IAED,iEAwBC;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;;;;;;;;;;;;MAoCC;IAED,oFAMC;IAED,6EA2BC;IAED,qCAeC;IAED,+FAYC;IAED,wDAUC;IAED,4EAKC;IAED,mEAKC;IAED;;;MAMC;IAED,gEAKC;IAED,uEAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,2DAMC;IAED,uDAoBC;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,qCAUC;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":"AA8IA;IAsCE;;;;;;;;;;;MAWE;IAEF,+BAgBC;IA9DD,gCAAgC;IAChC,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,qBAAqC;IACrC,4BAAiC;IACjC,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,iCAEG;IACH,cAAU;IACV,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,oBAAiD;IAMnD,mCASC;IAED,2DAYC;IAED,yCAmBC;IAED,oCASC;IAED,sBA6BC;IAED,8DAeC;IAED;;;;MAeC;IAED,6CAMC;IAED,2CAsBC;IAED,kDA6BC;IAED,4DASC;IAED,gEAsDC;IAED,mCASC;IAED,uBASC;IAED,yDAqCC;IAED,2BA0EC;IAED,uDAEC;IAED,wDAEC;IAED,qCAKC;IAED;;;MAwDC;IAED,kGAeC;IAED,mGAeC;IAED,wEAQC;IAED,uBAMC;IAED,sBAIC;IAED,uBAMC;IAED,wBAIC;IAED,0BAKC;IAED,8BAMC;IAED,wBAYC;IAED,sBAIC;IAED,kEAWC;IAED,kFAYC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,2DAIC;IAED,6CAEC;IAED,sDAeC;IAED,4DASC;IAED,qDAkBC;IAED,6CAIC;IAED,sDA6BC;IAED,kEAqBC;IAED,4GAkCC;IAED,uEAyCC;IAED,0EAiBC;IAED,oEASC;IAED,0FAwBC;IAED,gCASC;IAED,iEAwBC;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;;;;;;;;;;;;MAoCC;IAED,oFAMC;IAED,6EA2BC;IAED,qCAeC;IAED,+FAYC;IAED,wDAUC;IAED,4EAKC;IAED,mEAKC;IAED;;;MAMC;IAED,gEAKC;IAED,uEAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,2DAMC;IAED,uDAoBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAMC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,6CAmBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAUC;IAED,4EAaC;IAED,4DAGC;IAED,qDAKC;IAED,gDAYC;IAGD,6DAgBC;CACF;AAvrDD;IAgBE,4CAIC;IAnBD,gBAAe;IACf,sBAAkB;IAClB,sBAAkB;IAClB,eAAW;IACX,gBAAY;IACZ,gBAAY;IACZ,eAAa;IACb,eAAa;IACb,6BAA0B;IAC1B,mBAAe;IACf,qBAAiB;IACjB,sBAAoB;IACpB,oBAAkB;IAClB,0BAA2B;IAKzB,uBAAkC;IAGpC,mCAEC;CACF;AAuBD;IACE,iCAA8B;CAa/B"}