@marmooo/midy 0.5.0 → 0.5.1

package/README.md

@@ -94,9 +94,9 @@ midy.addEventListener("resumed", func);
 midy.addEventListener("seeked", func);
 ```
 
-## Cache Mode
+### Cache Mode
 
-- "none" -for full real-time control (dynamic CC, LFO, pitch)
+- "none" - for full real-time control (dynamic CC, LFO, pitch)
 - "ads" - for real-time playback with higher cache hit rate
 - "adsr" - for real-time playback with accurate release envelope
 - "note" - for efficient playback when note behavior is fixed
@@ -104,6 +104,21 @@ midy.addEventListener("seeked", func);
 
 ```
 const midy = new Midy(audioContext, { cacheMode: "note" });
+midy.cacheMode = "audio";
+```
+
+### Reverb Mode
+
+- "Convolution" - Convolution Reverb
+- "Schroeder" - Schroeder (1962)
+- "Moorer" - Moorer (1979)
+- "FDN" - FDN (1992)
+- "Dattorro" - Dattorro (1997)
+- "Freeverb" - Freeverb (1999)
+- "VelvetNoise" - Velvet Noise Reverb (2012)
+
+```
+midy.setReverbEffect("FDN");
 ```
 
 ### MIDI Message

package/esm/midy-GM1.d.ts

@@ -130,7 +130,7 @@ export class MidyGM1 extends EventTarget {
     getAudioBuffer(channel: any, note: any, realtime: any): Promise<any>;
     getAdsCachedBuffer(channel: any, note: any, audioBufferId: any, realtime: any): Promise<any>;
     getAdsrCachedBuffer(note: any, audioBufferId: any): Promise<any>;
-    getFullCachedBuffer(note: any, audioBufferId: any): Promise<any>;
+    getFullCachedBuffer(channel: any, note: any, audioBufferId: any): Promise<any>;
     setNoteAudioNode(channel: any, note: any, realtime: any): Promise<any>;
     handleExclusiveClass(note: any, channelNumber: any, startTime: any): void;
     setNoteRouting(channelNumber: any, note: any, startTime: any): void;
@@ -209,7 +209,8 @@ export class MidyGM1 extends EventTarget {
     scheduleTask(callback: any, scheduleTime: any): Promise<any>;
 }
 declare class Channel {
-    constructor(audioNodes: any, settings: any);
+    constructor(channelNumber: any, audioNodes: any, settings: any);
+    channelNumber: number;
     isDrum: boolean;
     programNumber: number;
     scheduleIndex: number;

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

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

package/esm/midy-GM1.js

@@ -160,7 +160,13 @@ class Note {
     }
 }
 class Channel {
-    constructor(audioNodes, settings) {
+    constructor(channelNumber, audioNodes, settings) {
+        Object.defineProperty(this, "channelNumber", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
         Object.defineProperty(this, "isDrum", {
             enumerable: true,
             configurable: true,
@@ -245,6 +251,7 @@ class Channel {
             writable: true,
             value: null
         });
+        this.channelNumber = channelNumber;
         Object.assign(this, audioNodes);
         Object.assign(this, settings);
         this.state = new ControllerState();
@@ -874,6 +881,8 @@ export class MidyGM1 extends EventTarget {
             return;
         const soundFont = this.soundFonts[soundFontIndex];
         const voice = soundFont.getVoice(bank, programNumber, noteNumber, velocity);
+        if (!voice)
+            return;
         const { instrument, sampleID } = voice.generators;
         return soundFontIndex * (2 ** 31) + instrument * (2 ** 24) +
             (sampleID << 8);
@@ -890,7 +899,7 @@ export class MidyGM1 extends EventTarget {
     }
     createChannels(audioContext) {
         const settings = this.constructor.channelSettings;
-        return Array.from({ length: this.numChannels }, () => new Channel(this.createChannelAudioNodes(audioContext), settings));
+        return Array.from({ length: this.numChannels }, (_, ch) => new Channel(ch, this.createChannelAudioNodes(audioContext), settings));
     }
     decodeOggVorbis(sample) {
         const task = decoderQueue.then(async () => {
@@ -1356,6 +1365,7 @@ export class MidyGM1 extends EventTarget {
                         continue;
                     const soundFont = this.soundFonts[soundFontIndex];
                     const fakeChannel = {
+                        channelNumber: ch,
                         state: { array: renderControllerStates[ch].slice() },
                         programNumber,
                         isDrum,
@@ -1674,25 +1684,29 @@ export class MidyGM1 extends EventTarget {
         const volHold = volAttack + voiceParams.volHold;
         const decayDuration = voiceParams.volDecay;
         const adsDuration = volHold + decayDuration * decayCurve * 5;
-        const loopStartTime = voiceParams.loopStart / voiceParams.sampleRate;
-        const loopDuration = isLoop
+        const sampleLoopStart = voiceParams.loopStart / voiceParams.sampleRate;
+        const sampleLoopDuration = isLoop
             ? (voiceParams.loopEnd - voiceParams.loopStart) / voiceParams.sampleRate
             : 0;
-        const loopCount = isLoop && adsDuration > loopStartTime
-            ? Math.ceil((adsDuration - loopStartTime) / loopDuration)
+        const playbackRate = voiceParams.playbackRate;
+        const outputLoopStart = sampleLoopStart / playbackRate;
+        const outputLoopDuration = sampleLoopDuration / playbackRate;
+        const loopCount = isLoop && adsDuration > outputLoopStart
+            ? Math.ceil((adsDuration - outputLoopStart) / outputLoopDuration)
             : 0;
-        const alignedLoopStart = loopStartTime + loopCount * loopDuration;
+        const alignedLoopStart = outputLoopStart + loopCount * outputLoopDuration;
         const renderDuration = isLoop
-            ? alignedLoopStart + loopDuration
-            : audioBuffer.duration;
-        const offlineContext = new OfflineAudioContext(audioBuffer.numberOfChannels, Math.ceil(renderDuration * this.audioContext.sampleRate), this.audioContext.sampleRate);
+            ? alignedLoopStart + outputLoopDuration
+            : audioBuffer.duration / playbackRate;
+        const sampleRate = this.audioContext.sampleRate;
+        const offlineContext = new OfflineAudioContext(audioBuffer.numberOfChannels, Math.ceil(renderDuration * sampleRate), sampleRate);
         const bufferSource = new AudioBufferSourceNode(offlineContext);
         bufferSource.buffer = audioBuffer;
-        bufferSource.playbackRate.value = voiceParams.playbackRate;
+        bufferSource.playbackRate.value = playbackRate;
         bufferSource.loop = isLoop;
         if (isLoop) {
-            bufferSource.loopStart = loopStartTime;
-            bufferSource.loopEnd = loopStartTime + loopDuration;
+            bufferSource.loopStart = sampleLoopStart;
+            bufferSource.loopEnd = sampleLoopStart + sampleLoopDuration;
         }
         const initialFreq = this.clampCutoffFrequency(this.centToHz(voiceParams.initialFilterFc));
         const filterEnvelopeNode = new BiquadFilterNode(offlineContext, {
@@ -1724,7 +1738,7 @@ export class MidyGM1 extends EventTarget {
             isLoop,
             adsDuration,
             loopStart: alignedLoopStart,
-            loopDuration,
+            loopDuration: outputLoopDuration,
         });
     }
     async createAdsrRenderedBuffer(note, voiceParams, audioBuffer, noteDuration) {
@@ -1822,7 +1836,7 @@ export class MidyGM1 extends EventTarget {
     }
     async createFullRenderedBuffer(channel, note, voiceParams, noteDuration, noteEvent = {}) {
         const { startTime: noteStartTime = 0, events: noteEvents = [] } = noteEvent;
-        const ch = note.channel ?? 0;
+        const ch = channel.channelNumber;
         const releaseEndDuration = voiceParams.volRelease * releaseCurve * 5;
         const totalDuration = noteDuration + releaseEndDuration;
         const sampleRate = this.audioContext.sampleRate;
@@ -1871,7 +1885,7 @@ export class MidyGM1 extends EventTarget {
         const audioBufferId = this.getVoiceId(channel, noteNumber, velocity);
         if (!realtime) {
             if (cacheMode === "note") {
-                return await this.getFullCachedBuffer(note, audioBufferId);
+                return await this.getFullCachedBuffer(channel, note, audioBufferId);
             }
             else if (cacheMode === "adsr") {
                 return await this.getAdsrCachedBuffer(note, audioBufferId);
@@ -1962,7 +1976,7 @@ export class MidyGM1 extends EventTarget {
         durationMap.set(cacheKey, renderPromise);
         return await renderPromise;
     }
-    async getFullCachedBuffer(note, audioBufferId) {
+    async getFullCachedBuffer(channel, note, audioBufferId) {
         const voiceParams = note.voiceParams;
         const timelineIndex = note.timelineIndex;
         const noteEvent = this.noteOnEvents.get(timelineIndex);
@@ -1987,7 +2001,7 @@ export class MidyGM1 extends EventTarget {
         }
         const renderPromise = (async () => {
             try {
-                const rendered = await this.createFullRenderedBuffer(this.channels[note.channel], note, voiceParams, noteDuration, noteEvent);
+                const rendered = await this.createFullRenderedBuffer(channel, note, voiceParams, noteDuration, noteEvent);
                 durationMap.set(cacheKey, rendered);
                 return rendered;
             }
@@ -2014,7 +2028,6 @@ export class MidyGM1 extends EventTarget {
         note.renderedBuffer = isRendered ? audioBuffer : null;
         note.bufferSource = this.createBufferSource(voiceParams, audioBuffer);
         note.volumeNode = new GainNode(audioContext);
-        note.volumeNode.gain.setValueAtTime(1, now);
         const cacheMode = this.cacheMode;
         const isFullCached = isRendered && audioBuffer.isFull === true;
         if (cacheMode === "none") {
@@ -2091,9 +2104,6 @@ export class MidyGM1 extends EventTarget {
             startTime = this.audioContext.currentTime;
         const note = new Note(noteNumber, velocity, startTime);
         note.channel = channelNumber;
-        const channel = this.channels[channelNumber];
-        note.index = channel.scheduledNotes.length;
-        channel.scheduledNotes.push(note);
         return note;
     }
     async setupNote(channelNumber, note, startTime) {
@@ -2116,6 +2126,8 @@ export class MidyGM1 extends EventTarget {
         note.voice = soundFont.getVoice(bank, programNumber, note.noteNumber, note.velocity);
         if (!note.voice)
             return;
+        note.index = channel.scheduledNotes.length;
+        channel.scheduledNotes.push(note);
         await this.setNoteAudioNode(channel, note, realtime);
         this.setNoteRouting(channelNumber, note, startTime);
         note.resolveReady();
@@ -2161,18 +2173,8 @@ export class MidyGM1 extends EventTarget {
                 const volRelease = endTime + volDuration;
                 note.volumeNode.gain
                     .cancelScheduledValues(endTime)
-                    .setValueAtTime(1, endTime)
                     .setTargetAtTime(0, endTime, volDuration * releaseCurve);
-                return new Promise((resolve) => {
-                    this.scheduleTask(() => {
-                        note.bufferSource.loop = false;
-                        note.bufferSource.stop(volRelease);
-                        this.disconnectNote(note);
-                        channel.scheduledNotes[note.index] = undefined;
-                        this.releaseFullCache(note);
-                        resolve();
-                    }, volRelease);
-                });
+                note.bufferSource.stop(volRelease);
             }
             else {
                 const now = this.audioContext.currentTime;
@@ -2182,15 +2184,16 @@ export class MidyGM1 extends EventTarget {
                     this.releaseFullCache(note);
                     return Promise.resolve();
                 }
-                return new Promise((resolve) => {
-                    this.scheduleTask(() => {
-                        this.disconnectNote(note);
-                        channel.scheduledNotes[note.index] = undefined;
-                        this.releaseFullCache(note);
-                        resolve();
-                    }, naturalEndTime);
-                });
+                note.bufferSource.stop(naturalEndTime);
             }
+            return new Promise((resolve) => {
+                note.bufferSource.onended = () => {
+                    this.disconnectNote(note);
+                    channel.scheduledNotes[note.index] = undefined;
+                    this.releaseFullCache(note);
+                    resolve();
+                };
+            });
         }
         const volDuration = note.voiceParams.volRelease;
         const volRelease = endTime + volDuration;
@@ -2211,45 +2214,33 @@ export class MidyGM1 extends EventTarget {
                 const noteOffTime = note.startTime + (rb.noteDuration ?? 0);
                 const isEarlyCut = endTime < noteOffTime;
                 if (isEarlyCut) {
-                    const volRelease = endTime + volDuration;
                     note.volumeNode.gain
                         .cancelScheduledValues(endTime)
-                        .setValueAtTime(1, endTime)
                         .setTargetAtTime(0, endTime, volDuration * releaseCurve);
-                    return new Promise((resolve) => {
-                        this.scheduleTask(() => {
-                            note.bufferSource.stop(volRelease);
-                            this.disconnectNote(note);
-                            channel.scheduledNotes[note.index] = undefined;
-                            resolve();
-                        }, volRelease);
-                    });
+                    note.bufferSource.stop(volRelease);
                 }
                 else {
-                    return new Promise((resolve) => {
-                        this.scheduleTask(() => {
-                            note.bufferSource.stop();
-                            this.disconnectNote(note);
-                            channel.scheduledNotes[note.index] = undefined;
-                            resolve();
-                        }, naturalEndTime);
-                    });
+                    note.bufferSource.stop(naturalEndTime);
                 }
+                return new Promise((resolve) => {
+                    note.bufferSource.onended = () => {
+                        this.disconnectNote(note);
+                        channel.scheduledNotes[note.index] = undefined;
+                        resolve();
+                    };
+                });
             }
             note.volumeNode.gain
                 .cancelScheduledValues(endTime)
-                .setValueAtTime(1, endTime)
                 .setTargetAtTime(0, endTime, volDuration * releaseCurve);
         }
+        note.bufferSource.stop(volRelease);
         return new Promise((resolve) => {
-            this.scheduleTask(() => {
-                const bufferSource = note.bufferSource;
-                bufferSource.loop = false;
-                bufferSource.stop(volRelease);
+            note.bufferSource.onended = () => {
                 this.disconnectNote(note);
                 channel.scheduledNotes[note.index] = undefined;
                 resolve();
-            }, volRelease);
+            };
         });
     }
     noteOff(channelNumber, noteNumber, _velocity, endTime, force) {
@@ -2805,9 +2796,10 @@ export class MidyGM1 extends EventTarget {
     setMasterVolume(value, scheduleTime) {
         if (!(0 <= scheduleTime))
             scheduleTime = this.audioContext.currentTime;
+        const timeConstant = this.perceptualSmoothingTime / 5; // 99.3% (5 * tau)
         this.masterVolume.gain
-            .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(value * value, scheduleTime);
+            .cancelAndHoldAtTime(scheduleTime)
+            .setTargetAtTime(value * value, scheduleTime, timeConstant);
     }
     handleSysEx(data, scheduleTime) {
         switch (data[0]) {

package/esm/midy-GM2.d.ts

@@ -94,7 +94,7 @@ export class MidyGM2 extends EventTarget {
     reverbEffect: {
         input: any;
         output: any;
-    } | undefined;
+    };
     chorusEffect: {
         input: any;
         output: any;
@@ -116,7 +116,7 @@ export class MidyGM2 extends EventTarget {
         gainR: any;
         merger: any;
     };
-    createChannels(audioContext: any): Channel[];
+    createChannels(): Channel[];
     decodeOggVorbis(sample: any): Promise<any>;
     createAudioBuffer(voiceParams: any): Promise<any>;
     isLoopDrum(channel: any, noteNumber: any): boolean;
@@ -148,24 +148,13 @@ export class MidyGM2 extends EventTarget {
     currentTime(): number;
     processScheduledNotes(channel: any, callback: any): Promise<void>;
     processActiveNotes(channel: any, scheduleTime: any, callback: any): Promise<void>;
-    createConvolutionReverbImpulse(audioContext: any, decay: any, preDecay: any): any;
-    createConvolutionReverb(audioContext: any, impulse: any): {
-        input: any;
-        output: any;
-        convolverNode: any;
-    };
-    createCombFilter(audioContext: any, input: any, delay: any, feedback: any): any;
-    createAllpassFilter(audioContext: any, input: any, delay: any, feedback: any): any;
     generateDistributedArray(center: any, count: any, varianceRatio?: number, randomness?: number): any[];
-    createSchroederReverb(audioContext: any, combFeedbacks: any, combDelays: any, allpassFeedbacks: any, allpassDelays: any): {
+    setReverbEffect(algorithm: any): void;
+    createReverbEffect(algorithm: any): {
         input: any;
         output: any;
     };
-    createReverbEffect(audioContext: any): {
-        input: any;
-        output: any;
-    } | undefined;
-    createChorusEffect(audioContext: any): {
+    createChorusEffect(): {
         input: any;
         output: any;
         sendGain: any;
@@ -200,7 +189,7 @@ export class MidyGM2 extends EventTarget {
     getAudioBuffer(channel: any, note: any, realtime: any): Promise<any>;
     getAdsCachedBuffer(channel: any, note: any, audioBufferId: any, realtime: any): Promise<any>;
     getAdsrCachedBuffer(channel: any, note: any, audioBufferId: any): Promise<any>;
-    getFullCachedBuffer(note: any, audioBufferId: any): Promise<any>;
+    getFullCachedBuffer(channel: any, note: any, audioBufferId: any): Promise<any>;
     setNoteAudioNode(channel: any, note: any, realtime: any): Promise<any>;
     handleExclusiveClass(note: any, channelNumber: any, startTime: any): void;
     handleDrumExclusiveClass(note: any, channelNumber: any, startTime: any): void;
@@ -353,7 +342,8 @@ export class MidyGM2 extends EventTarget {
     scheduleTask(callback: any, scheduleTime: any): Promise<any>;
 }
 declare class Channel {
-    constructor(audioNodes: any, settings: any);
+    constructor(channelNumber: any, audioNodes: any, settings: any);
+    channelNumber: number;
     isDrum: boolean;
     programNumber: number;
     scheduleIndex: number;

package/esm/midy-GM2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"AA4TA;IAgEE;;;;;;;;;;;;;;MAcE;IAEF,6CAuBC;IAlGD,gCAAgC;IAChC,aAAa;IACb,yBAAqB;IACrB,2BAAuB;IACvB;;;;MAIE;IACF;;;;;;MAME;IACF,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAsB;IACtB,+BAA6B;IAC7B,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,0BAAuD;IACvD,4BAAyB;IACzB,0BAAuB;IACvB,kCAA+B;IAC/B,qBAAqC;IACrC,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,iCAA2C;IAC3C,cAAU;IACV,cAAa;IACb,iBAAY;IACZ,gBAAc;IACd,oBAAkB;IAClB,sBAAwB;IACxB,2BAAqC;IACrC,+BAEE;IAEF,8BAA2B;IAE3B,+BAA4B;IAC5B,4BAAyB;IACzB,8BAA2B;IAE3B,0BAA2B;IAC3B,qBAAoB;IACpB,4BAA6B;IAoB3B,kBAAgC;IAChC,eAAwD;IACxD,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF,uBAAmD;IACnD;;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,kCAAyE;IACzE,sBAAiD;IACjD,oBAAqC;IACrC;;;MAAkE;IAClE;;;;;;;;MAA6C;IAQ/C,mCASC;IAED,2DAYC;IAED,yCAmBC;IAED,oCAYC;IAED,6BAqJC;IAED,sBAuCC;IAED,6EAiBC;IAED;;;;MAWC;IAED,4BAQC;IAED,2CAsBC;IAED,kDA6BC;IAED,mDAIC;IAED,6FAqBC;IAED,gEA2DC;IAED,mCASC;IAED,uBAWC;IAED,yDA4CC;IAED,iCA4EC;IAED,2BAuFC;IAED,uDAEC;IAED,wDAEC;IAED,qCAMC;IAED;;;MAqFC;IAED,kGAeC;IAED,mGAeC;IAED,wEAQC;IAED,oCAqMC;IAED,uBAMC;IAED,sBAIC;IAED,uBAMC;IAED,wBAIC;IAED,0BAKC;IAED,8BAoBC;IAED,wBAYC;IAED,sBAOC;IAED,kEAWC;IAED,kFAYC;IAED,sGAcC;IAED,sCAIC;IAED;;;MA4DC;IAED;;;;;;;;MA2CC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAWC;IAED,2DASC;IAED,oDAEC;IAED,6CAIC;IAED,mDAIC;IAED,2CAoDC;IAED,8EASC;IAED,oEAiBC;IAED,sEASC;IAED,4DAMC;IAED,6EAOC;IAED,qDAkBC;IAED,6CAIC;IAED,8EAmBC;IAED,oEAgCC;IAED,kEAwBC;IAED,+DAgBC;IAED,gIAyEC;IAED,kIA0GC;IAED,gIA6DC;IAED,qEAwBC;IAED,6FAuCC;IAED,+EAgDC;IAED,+EA0CC;IAED,uEAqFC;IAED,0EAiBC;IAED,8EAoBC;IAED,oEAyBC;IAED,yFAQC;IAED,qFAKC;IAED,uEAiCC;IAED,gCAoBC;IAED,kCAWC;IAED,iEAkFC;IAED,4FAqBC;IAED,6CAUC;IAED,qDAUC;IAED,qFAeC;IAED,uFAkBC;IAED,+BAuBC;IAED,kDAOC;IAED,sBAEC;IAED,mFAcC;IAED,4EAYC;IAED,wFAGC;IAED,sEAWC;IAED,mEAaC;IAED,mEAYC;IAED,sEAMC;IAED,oEAQC;IAED,gEAyBC;IAED,gEAyBC;IAED,gCAKC;IAED,kDAKC;IAED,8CAOC;IAED,gEAMC;IAED;;;;;;;;;;;;MAwDC;IAED,oFAMC;IAED,6EAgCC;IAED,qCA2BC;IAED,+FAeC;IAED,+CAEC;IAED,wDAWC;IAED,4EAMC;IAED,wDAeC;IAED,2EAMC;IAED,mEAKC;IAED,mDAQC;IAED;;;MAMC;IAED,gEAWC;IAED,uEAKC;IAED,+CAEC;IAED,sEAGC;IAED,2DAWC;IAED,4EAoBC;IAED,yEAgBC;IAED,+CAEC;IAED,uEAMC;IAED,2EAkBC;IAED,oDAEC;IAED,0EAeC;IAED,sFAQC;IAED,sFAQC;IAED,kFAeC;IAED,2DAMC;IAED,uDAuBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAWC;IAED,iEAMC;IAED,uEASC;IAED,mEAKC;IAED,yEASC;IAED,2EAKC;IAED,iFAMC;IAED,gFAGC;IAED,6CAsBC;IAGD,8EAoCC;IAED,gFAGC;IAED,iEAEC;IAED,gEAEC;IAED,gEAIC;IAED,gEAIC;IAED,+EAgCC;IAED,qCAaC;IAED,qCAaC;IAED,4EAwCC;IAED,4DAGC;IAED,qDAMC;IAED,gEAIC;IAED,yDAYC;IAED,kEAGC;IAED,2DAYC;IAED,sEAeC;IAED,4CAOC;IAED,+BAIC;IAED,qDAiBC;IAED,gCAGC;IAED,kCAEC;IA6BD,4CAEC;IAED,+DAaC;IAED,kDAiBC;IAED,2GAKC;IAED,sDAIC;IAED,qCAEC;IAED,uDAMC;IAED,sCAEC;IAED,uDASC;IAED,sCAEC;IAED,2DAqBC;IAED,0CAEC;IAED,mCAeC;IAED,2FAgBC;IAED,wDAEC;IAED,+DAGC;IAED,qEASC;IAED,uEAOC;IAED,6CAEC;IAED,iDAEC;IAED,6CAEC;IAED,iDAEC;IAED,0CAEC;IAED,uCAEC;IAED,wCAEC;IAED,2CAEC;IAED,8BAyBC;IAED,0EAQC;IAED,4EAOC;IAED,qFASC;IAED,+DAEC;IAED,wEAcC;IAED,6DAiBC;IAED,yEAIC;IAED,0CAmBC;IAED,yEAcC;IAED,gDAYC;IAGD,6DAgBC;CACF;AAxhID;IA2BE,gEAKC;IA/BD,sBAAkB;IAClB,gBAAe;IACf,sBAAkB;IAClB,sBAAkB;IAClB,eAAW;IACX,gBAAc;IACd,gBAAY;IACZ,gBAAY;IACZ,gBAAY;IACZ,eAAa;IACb,eAAa;IACb,cAAa;IACb,6BAA0B;IAC1B,mBAAe;IACf,qBAAiB;IACjB,sBAAoB;IACpB,oBAAkB;IAClB,sBAAoB;IACpB,qCAAmD;IACnD,+CAA2C;IAC3C,6CAA4D;IAC5D,sCAAkD;IAClD,sBAAgC;IAChC,sBAAgC;IAChC,0BAA2B;IAMzB,uBAAkC;IAGpC,mCAEC;IAED,mBAKC;CACF;AAuID;IAUE,oCASC;IAlBD,YAAO;IACP,YAAO;IACP,YAAO;IACP,iBAAY;IACZ,eAAU;IACV,kBAAa;IACb,kBAAa;IACb,qBAAgB;CAYjB;AAvOD;IAsBE,4DAOC;IA5BD,WAAM;IACN,iBAAY;IACZ,yBAAyB;IACzB,cAAW;IACX,gBAAe;IACf,kBAAa;IACb,oBAAqB;IACrB,qBAAsB;IACtB,uBAAwB;IACxB,wBAAmB;IACnB,wBAAmB;IACnB,YAAO;IACP,mBAAc;IACd,sBAAiB;IACjB,oBAAe;IACf,YAAO;IACP,mBAAc;IACd,gBAAW;IACX,gBAAW;IACX,6BAA0B;IAGxB,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,oBAEE;IADA,mCAA2B;CAGhC;AAsHD;IACE,iCAA8B;CAa/B"}