npm - @marmooo/midy - Versions diffs - 0.4.7 → 0.4.9 - Mend

@marmooo/midy 0.4.7 → 0.4.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/README.md +6 -2
package/esm/midy-GM1.d.ts +25 -2
package/esm/midy-GM1.d.ts.map +1 -1
package/esm/midy-GM1.js +97 -16
package/esm/midy-GM2.d.ts +39 -3
package/esm/midy-GM2.d.ts.map +1 -1
package/esm/midy-GM2.js +176 -39
package/esm/midy-GMLite.d.ts +23 -2
package/esm/midy-GMLite.d.ts.map +1 -1
package/esm/midy-GMLite.js +85 -15
package/esm/midy.d.ts +41 -3
package/esm/midy.d.ts.map +1 -1
package/esm/midy.js +212 -51
package/package.json +1 -1
package/script/midy-GM1.d.ts +25 -2
package/script/midy-GM1.d.ts.map +1 -1
package/script/midy-GM1.js +97 -16
package/script/midy-GM2.d.ts +39 -3
package/script/midy-GM2.d.ts.map +1 -1
package/script/midy-GM2.js +176 -39
package/script/midy-GMLite.d.ts +23 -2
package/script/midy-GMLite.d.ts.map +1 -1
package/script/midy-GMLite.js +85 -15
package/script/midy.d.ts +41 -3
package/script/midy.d.ts.map +1 -1
package/script/midy.js +212 -51

package/script/midy-GM1.js CHANGED Viewed

@@ -95,6 +95,100 @@ 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, "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, "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);
+    }
+}
 // normalized to 0-1 for use with the SF2 modulator model
 const defaultControllerState = {
     noteOnVelocity: { type: 2, defaultValue: 0 },
@@ -485,18 +579,8 @@ class MidyGM1 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 () => {
@@ -608,7 +692,6 @@ class MidyGM1 extends EventTarget {
     }
     resetAllStates() {
         this.exclusiveClassNotes.fill(undefined);
-        this.drumExclusiveClassNotes.fill(undefined);
         this.voiceCache.clear();
         this.realtimeVoiceCache.clear();
         const channels = this.channels;
@@ -1629,9 +1712,7 @@ class MidyGM1 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/script/midy-GM2.d.ts CHANGED Viewed

@@ -82,7 +82,7 @@ export class MidyGM2 extends EventTarget {
     controlChangeHandlers: any[];
     keyBasedControllerHandlers: any[];
     effectHandlers: any[];
-    channels: any[];
+    channels: Channel[];
     reverbEffect: {
         input: any;
         output: any;
@@ -107,8 +107,7 @@ export class MidyGM2 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;
@@ -237,6 +236,7 @@ export class MidyGM2 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;
@@ -320,7 +320,9 @@ export class MidyGM2 extends EventTarget {
     getLFOAmplitudeDepth(channel: any): number;
     createEffectHandlers(): any[];
     setControlChangeEffects(channel: any, note: any, scheduleTime: any): void;
+    setChannelPressureEffects(channel: any, note: any, scheduleTime: any): void;
     setPressureEffects(channel: any, note: any, tableName: any, scheduleTime: any): void;
+    handleChannelPressureSysEx(data: any, scheduleTime: any): void;
     handlePressureSysEx(data: any, tableName: any, scheduleTime: any): void;
     handleControlChangeSysEx(data: any, scheduleTime: any): void;
     getKeyBasedValue(channel: any, keyNumber: any, controllerType: any): any;
@@ -329,4 +331,38 @@ export class MidyGM2 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;
+    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: Int8Array<ArrayBuffer>;
+    channelPressureTable: Int8Array<ArrayBuffer>;
+    keyBasedTable: Int8Array<ArrayBuffer>;
+    keyBasedGainLs: any[];
+    keyBasedGainRs: any[];
+    currentBufferSource: null;
+    state: ControllerState;
+    resetSettings(settings: any): void;
+    resetTable(): void;
+}
+declare class ControllerState {
+    array: Float32Array<ArrayBuffer>;
+}
+export {};
 //# sourceMappingURL=midy-GM2.d.ts.map

package/script/midy-GM2.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"~~AAwLA~~;IAwDE;;;;;;;;;;;;;;MAcE;IAEF,+BAsBC;IAzFD,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,iCAEG;IACH,cAAU;IACV,cAAa;IACb,iBAAY;IACZ,gBAAc;IACd,oBAAkB;IAClB,sBAAwB;IACxB,2BAAqC;IACrC,+BAEE;IAoBA,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF,uBAAmD;IACnD;;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,kCAAyE;IACzE,sBAAiD;IACjD,~~gBAAiD~~;IACjD;;;kBAAyD;IACzD;;;;;;;;MAAyD;IAQ3D,mCASC;IAED,2DAYC;IAED,yCAmBC;IAED,oCASC;IAED,sBAoCC;IAED,8DAeC;IAED;;;;MAeC;IAED,~~sCAKC~~;IAED,~~yCAqBC;IAED,~~2CAsBC;IAED,kDA6BC;IAED,mDAIC;IAED,2FAWC;IAED,gEAyDC;IAED,mCASC;IAED,uBAUC;IAED,yDAqCC;IAED,2BAoFC;IAED,uDAEC;IAED,wDAEC;IAED,qCAMC;IAED;;;MAqFC;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,kFAuBC;IAED;;;;MASC;IAED,gFAUC;IAED,mFAYC;IAED,sGAcC;IAID;;;MA8BC;IAED;;;kBA6BC;IAED;;;;;;;;MA0CC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAWC;IAED,2DAQC;IAED,oDAEC;IAED,6CAIC;IAED,mDAIC;IAED,2CAoDC;IAED,8EASC;IAED,oEAgBC;IAED,sEASC;IAED,4DASC;IAED,6EAOC;IAED,qDAkBC;IAED,6CAIC;IAED,8EAmBC;IAED,oEA+BC;IAED,kEAqBC;IAED,+DAeC;IAED,4GAkCC;IAED,uEAkEC;IAED,0EAiBC;IAED,8EAoBC;IAED,oEAuBC;IAED,0FAuBC;IAED,gCAmBC;IAED,iEAwBC;IAED,4FA2BC;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,oFAOC;IAED,6EA+BC;IAED,qCA2BC;IAED,+FAeC;IAED,+CAEC;IAED,wDAUC;IAED,4EAMC;IAED,wDAeC;IAED,2EAMC;IAED,~~mEAWC~~;IAED;;;MAMC;IAED,gEAWC;IAED,uEAKC;IAED,+CAEC;IAED,sEAGC;IAED,2DAWC;IAED,4EAoBC;IAED,yEAYC;IAED,+CAEC;IAED,uEAMC;IAED,2EAcC;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,~~6CAwBC~~;IAGD,8EAoCC;IAED,gFAGC;IAED,iEAEC;IAED,gEAEC;IAED,gEAIC;IAED,gEAIC;IAED,+EAgCC;IAED,qCAaC;IAED,qCAaC;IAED,~~4EA4CC~~;IAED,4DAGC;IAED,qDAKC;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,uCAEC;IAED,wCAEC;IAED,2CAEC;IAED,~~8BA8BC~~;IAED,0EAQC;IAED,qFASC;IAED,wEAcC;IAED,6DAiBC;IAED,yEAIC;IAED,0CAmBC;IAED,yEAcC;IAED,gDAYC;IAGD,6DAgBC;CACF"}
1	+ {"version":3,"file":"midy-GM2.d.ts","sourceRoot":"","sources":["../src/midy-GM2.js"],"names":[],"mappings":"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"}

package/script/midy-GM2.js CHANGED Viewed

@@ -125,6 +125,166 @@ 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 Int8Array(12)
+        }); // [-64, 63] cent
+        Object.defineProperty(this, "channelPressureTable", {
+            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() {
+        this.controlTable.set(defaultControlValues);
+        this.scaleOctaveTuningTable.fill(0); // [-100, 100] cent
+        this.channelPressureTable.set(defaultPressureValues);
+        this.keyBasedTable.fill(-1);
+    }
+}
 const drumExclusiveClassesByKit = new Array(57);
 const drumExclusiveClassCount = 10;
 const standardSet = new Uint8Array(128);
@@ -636,32 +796,9 @@ class MidyGM2 extends EventTarget {
             merger,
         };
     }
-    resetChannelTable(channel) {
-        channel.controlTable.set(defaultControlValues);
-        channel.scaleOctaveTuningTable.fill(0); // [-100, 100] cent
-        channel.channelPressureTable.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 Int8Array(12), // [-64, 63] cent
-                channelPressureTable: 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 () => {
@@ -1860,7 +1997,7 @@ class MidyGM2 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);
     }
@@ -2216,6 +2353,9 @@ class MidyGM2 extends EventTarget {
             scheduleTime = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.state.volumeMSB = value / 127;
+        this.applyVolume(channel, scheduleTime);
+    }
+    applyVolume(channel, scheduleTime) {
         if (channel.isDrum) {
             for (let i = 0; i < 128; i++) {
                 this.updateKeyBasedVolume(channel, i, scheduleTime);
@@ -2530,10 +2670,8 @@ class MidyGM2 extends EventTarget {
                 state[key] = defaultValue;
             }
         }
-        for (const key of Object.keys(this.constructor.channelSettings)) {
-            channel[key] = this.constructor.channelSettings[key];
-        }
-        this.resetChannelTable(channel);
+        channel.reset(this.constructor.channelSettings);
+        channel.resetTable();
         this.mode = "GM2";
         this.masterFineTuning = 0; // cent
         this.masterCoarseTuning = 0; // cent
@@ -2671,7 +2809,7 @@ class MidyGM2 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 3: // https://amei.or.jp/midistandardcommittee/Recommended_Practice/e/ca22.pdf
                         return this.handleControlChangeSysEx(data, scheduleTime);
                     default:
@@ -3023,14 +3161,7 @@ class MidyGM2 extends EventTarget {
                 this.setFilterEnvelope(channel, note, scheduleTime);
             }
         };
-        handlers[2] = (channel, note, scheduleTime) => {
-            if (0.5 <= channel.state.portamemento && 0 <= note.portamentoNoteNumber) {
-                this.setPortamentoVolumeEnvelope(channel, note, scheduleTime);
-            }
-            else {
-                this.setVolumeEnvelope(channel, note, scheduleTime);
-            }
-        };
+        handlers[2] = (channel, note, scheduleTime) => this.applyVolume(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);
@@ -3046,6 +3177,9 @@ class MidyGM2 extends EventTarget {
             handlers[i](channel, note, scheduleTime);
         }
     }
+    setChannelPressureEffects(channel, note, scheduleTime) {
+        this.setPressureEffects(channel, note, "channelPressureTable", scheduleTime);
+    }
     setPressureEffects(channel, note, tableName, scheduleTime) {
         const handlers = this.effectHandlers;
         const table = channel[tableName];
@@ -3057,6 +3191,9 @@ class MidyGM2 extends EventTarget {
             handlers[i](channel, note, scheduleTime);
         }
     }
+    handleChannelPressureSysEx(data, scheduleTime) {
+        this.handlePressureSysEx(data, "channelPressureTable", scheduleTime);
+    }
     handlePressureSysEx(data, tableName, scheduleTime) {
         const channelNumber = data[4];
         const channel = this.channels[channelNumber];

package/script/midy-GMLite.d.ts CHANGED Viewed

@@ -59,7 +59,7 @@ export class MidyGMLite 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>;
@@ -71,7 +71,7 @@ export class MidyGMLite 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(channel: any, voiceParams: any, audioBuffer: any): any;
@@ -183,4 +183,25 @@ export class MidyGMLite 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;
+    scheduledNotes: any[];
+    sustainNotes: any[];
+    currentBufferSource: null;
+    state: ControllerState;
+    resetSettings(settings: any): void;
+}
+declare class ControllerState {
+    array: Float32Array<ArrayBuffer>;
+}
+export {};
 //# sourceMappingURL=midy-GMLite.d.ts.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"~~AAiIA~~;IAwCE;;;;;;;;;MASE;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,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;IACrC,+BAEE;IAeA,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,0EAUC;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,wCAIC;IAED,2DAIC;IAED,6CAEC;IAED,sDAeC;IAED,4DASC;IAED,qDAkBC;IAED,6CAIC;IAED,sDA6BC;IAED,kEAqBC;IAED,4GAkCC;IAED,uEA6CC;IAED,0EAiBC;IAED,8EAiBC;IAED,oEAUC;IAED,0FAwBC;IAED,gCASC;IAED,iEAwBC;IAED,4FAsBC;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,uDAcC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,gFAGC;IAED,~~6CAqBC~~;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAUC;IAED,4EAaC;IAED,4DAGC;IAED,qDAKC;IAED,gDAYC;IAGD,6DAgBC;CACF"}
1	+ {"version":3,"file":"midy-GMLite.d.ts","sourceRoot":"","sources":["../src/midy-GMLite.js"],"names":[],"mappings":"AA0JA;IAwCE;;;;;;;;;MASE;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,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;IACrC,+BAEE;IAeA,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,0EAUC;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,wCAIC;IAED,2DAIC;IAED,6CAEC;IAED,sDAeC;IAED,4DASC;IAED,qDAkBC;IAED,6CAIC;IAED,sDA6BC;IAED,kEAqBC;IAED,4GAkCC;IAED,uEA6CC;IAED,0EAiBC;IAED,8EAiBC;IAED,oEAUC;IAED,0FAwBC;IAED,gCASC;IAED,iEAwBC;IAED,4FAsBC;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,uDAcC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,gFAGC;IAED,6CAmBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAUC;IAED,4EAaC;IAED,4DAGC;IAED,qDAKC;IAED,gDAYC;IAGD,6DAgBC;CACF;AA7qDD;IAcE,4CAIC;IAjBD,gBAAe;IACf,sBAAkB;IAClB,sBAAkB;IAClB,eAAW;IACX,gBAAY;IACZ,gBAAY;IACZ,eAAa;IACb,eAAa;IACb,6BAA0B;IAC1B,sBAAoB;IACpB,oBAAkB;IAClB,0BAA2B;IAKzB,uBAAkC;IAGpC,mCAEC;CACF;AAqCD;IACE,iCAA8B;CAa/B"}

package/script/midy-GMLite.js CHANGED Viewed

@@ -95,6 +95,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;
@@ -498,18 +580,8 @@ 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 () => {
@@ -1615,9 +1687,7 @@ 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