@marmooo/midy 0.4.8 → 0.4.9

package/script/midy.js

@@ -137,6 +137,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);
@@ -700,34 +867,9 @@ 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 () => {
@@ -1786,16 +1928,15 @@ 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];
@@ -2969,10 +3110,8 @@ 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