@marmooo/midy 0.1.5 → 0.1.6

package/script/midy-GM1.js

@@ -180,12 +180,14 @@ class MidyGM1 {
     addSoundFont(soundFont) {
         const index = this.soundFonts.length;
         this.soundFonts.push(soundFont);
-        soundFont.parsed.presetHeaders.forEach((presetHeader) => {
+        const presetHeaders = soundFont.parsed.presetHeaders;
+        for (let i = 0; i < presetHeaders.length; i++) {
+            const presetHeader = presetHeaders[i];
             if (!presetHeader.presetName.startsWith("\u0000")) { // TODO: Only SF3 generated by PolyPone?
                 const banks = this.soundFontTable[presetHeader.preset];
                 banks.set(presetHeader.bank, index);
             }
-        });
+        }
     }
     async loadSoundFont(soundFontUrl) {
         const response = await fetch(soundFontUrl);
@@ -230,27 +232,25 @@ class MidyGM1 {
         return channels;
     }
     async createNoteBuffer(instrumentKey, isSF3) {
+        const sampleStart = instrumentKey.start;
         const sampleEnd = instrumentKey.sample.length + instrumentKey.end;
         if (isSF3) {
-            const sample = new Uint8Array(instrumentKey.sample.length);
-            sample.set(instrumentKey.sample);
+            const sample = instrumentKey.sample.slice(sampleStart, sampleEnd);
             const audioBuffer = await this.audioContext.decodeAudioData(sample.buffer);
-            for (let channel = 0; channel < audioBuffer.numberOfChannels; channel++) {
-                const channelData = audioBuffer.getChannelData(channel);
-                channelData.set(channelData.subarray(0, sampleEnd));
-            }
             return audioBuffer;
         }
         else {
-            const sample = instrumentKey.sample.subarray(0, sampleEnd);
-            const floatSample = this.convertToFloat32Array(sample);
+            const sample = instrumentKey.sample.subarray(sampleStart, sampleEnd);
             const audioBuffer = new AudioBuffer({
                 numberOfChannels: 1,
                 length: sample.length,
                 sampleRate: instrumentKey.sampleRate,
             });
             const channelData = audioBuffer.getChannelData(0);
-            channelData.set(floatSample);
+            const int16Array = new Int16Array(sample.buffer);
+            for (let i = 0; i < int16Array.length; i++) {
+                channelData[i] = int16Array[i] / 32768;
+            }
             return audioBuffer;
         }
     }
@@ -266,14 +266,6 @@ class MidyGM1 {
         }
         return bufferSource;
     }
-    convertToFloat32Array(uint8Array) {
-        const int16Array = new Int16Array(uint8Array.buffer);
-        const float32Array = new Float32Array(int16Array.length);
-        for (let i = 0; i < int16Array.length; i++) {
-            float32Array[i] = int16Array[i] / 32768;
-        }
-        return float32Array;
-    }
     async scheduleTimelineEvents(t, offset, queueIndex) {
         while (queueIndex < this.timeline.length) {
             const event = this.timeline[queueIndex];
@@ -384,9 +376,11 @@ class MidyGM1 {
                 bank: this.channels[i].bank,
             };
         }
-        midi.tracks.forEach((track) => {
+        for (let i = 0; i < midi.tracks.length; i++) {
+            const track = midi.tracks[i];
             let currentTicks = 0;
-            track.forEach((event) => {
+            for (let j = 0; j < track.length; j++) {
+                const event = track[j];
                 currentTicks += event.deltaTime;
                 event.ticks = currentTicks;
                 switch (event.type) {
@@ -406,8 +400,8 @@ class MidyGM1 {
                 }
                 delete event.deltaTime;
                 timeline.push(event);
-            });
-        });
+            }
+        }
         const priority = {
             controller: 0,
             sysEx: 1,
@@ -432,7 +426,7 @@ class MidyGM1 {
         }
         return { instruments, timeline };
     }
-    async stopChannelNotes(channelNumber, velocity, stopPedal) {
+    async stopChannelNotes(channelNumber, velocity, force) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.scheduledNotes.forEach((noteList) => {
@@ -440,16 +434,16 @@ class MidyGM1 {
                 const note = noteList[i];
                 if (!note)
                     continue;
-                const promise = this.scheduleNoteRelease(channelNumber, note.noteNumber, velocity, now, stopPedal);
+                const promise = this.scheduleNoteRelease(channelNumber, note.noteNumber, velocity, now, force);
                 this.notePromises.push(promise);
             }
         });
         channel.scheduledNotes.clear();
         await Promise.all(this.notePromises);
     }
-    stopNotes(velocity, stopPedal) {
+    stopNotes(velocity, force) {
         for (let i = 0; i < this.channels.length; i++) {
-            this.stopChannelNotes(i, velocity, stopPedal);
+            this.stopChannelNotes(i, velocity, force);
         }
         return Promise.all(this.notePromises);
     }
@@ -626,7 +620,7 @@ class MidyGM1 {
         note.volumeNode = new GainNode(this.audioContext);
         note.filterNode = new BiquadFilterNode(this.audioContext, {
             type: "lowpass",
-            Q: instrumentKey.initialFilterQ / 10 * channel.filterResonance, // dB
+            Q: instrumentKey.initialFilterQ / 10, // dB
         });
         this.setVolumeEnvelope(note);
         this.setFilterEnvelope(note);
@@ -639,7 +633,7 @@ class MidyGM1 {
         }
         note.bufferSource.connect(note.filterNode);
         note.filterNode.connect(note.volumeNode);
-        note.bufferSource.start(startTime, instrumentKey.start / instrumentKey.sampleRate);
+        note.bufferSource.start(startTime);
         return note;
     }
     async scheduleNoteOn(channelNumber, noteNumber, velocity, startTime) {
@@ -668,9 +662,38 @@ class MidyGM1 {
         const now = this.audioContext.currentTime;
         return this.scheduleNoteOn(channelNumber, noteNumber, velocity, now);
     }
-    scheduleNoteRelease(channelNumber, noteNumber, _velocity, stopTime, stopPedal = false) {
+    stopNote(stopTime, endTime, scheduledNotes, index) {
+        const note = scheduledNotes[index];
+        note.volumeNode.gain
+            .cancelScheduledValues(stopTime)
+            .linearRampToValueAtTime(0, endTime);
+        note.ending = true;
+        this.scheduleTask(() => {
+            note.bufferSource.loop = false;
+        }, endTime);
+        return new Promise((resolve) => {
+            note.bufferSource.onended = () => {
+                scheduledNotes[index] = null;
+                note.bufferSource.disconnect();
+                note.volumeNode.disconnect();
+                note.filterNode.disconnect();
+                if (note.modulationDepth) {
+                    note.volumeDepth.disconnect();
+                    note.modulationDepth.disconnect();
+                    note.modulationLFO.stop();
+                }
+                if (note.vibratoDepth) {
+                    note.vibratoDepth.disconnect();
+                    note.vibratoLFO.stop();
+                }
+                resolve();
+            };
+            note.bufferSource.stop(endTime);
+        });
+    }
+    scheduleNoteRelease(channelNumber, noteNumber, _velocity, stopTime, force) {
         const channel = this.channels[channelNumber];
-        if (stopPedal && channel.sustainPedal)
+        if (!force && channel.sustainPedal)
             return;
         if (!channel.scheduledNotes.has(noteNumber))
             return;
@@ -682,32 +705,11 @@ class MidyGM1 {
             if (note.ending)
                 continue;
             const volEndTime = stopTime + note.instrumentKey.volRelease;
-            note.volumeNode.gain
-                .cancelScheduledValues(stopTime)
-                .linearRampToValueAtTime(0, volEndTime);
             const modRelease = stopTime + note.instrumentKey.modRelease;
             note.filterNode.frequency
                 .cancelScheduledValues(stopTime)
                 .linearRampToValueAtTime(0, modRelease);
-            note.ending = true;
-            this.scheduleTask(() => {
-                note.bufferSource.loop = false;
-            }, stopTime);
-            return new Promise((resolve) => {
-                note.bufferSource.onended = () => {
-                    scheduledNotes[i] = null;
-                    note.bufferSource.disconnect();
-                    note.volumeNode.disconnect();
-                    note.filterNode.disconnect();
-                    if (note.modulationDepth) {
-                        note.volumeDepth.disconnect();
-                        note.modulationDepth.disconnect();
-                        note.modulationLFO.stop();
-                    }
-                    resolve();
-                };
-                note.bufferSource.stop(volEndTime);
-            });
+            this.stopNote(stopTime, volEndTime, scheduledNotes, i);
         }
     }
     releaseNote(channelNumber, noteNumber, velocity) {
@@ -816,7 +818,7 @@ class MidyGM1 {
     setVolume(channelNumber, volume) {
         const channel = this.channels[channelNumber];
         channel.volume = volume / 127;
-        this.updateChannelGain(channel);
+        this.updateChannelVolume(channel);
     }
     panToGain(pan) {
         const theta = Math.PI / 2 * Math.max(0, pan - 1) / 126;
@@ -828,18 +830,18 @@ class MidyGM1 {
     setPan(channelNumber, pan) {
         const channel = this.channels[channelNumber];
         channel.pan = pan;
-        this.updateChannelGain(channel);
+        this.updateChannelVolume(channel);
     }
     setExpression(channelNumber, expression) {
         const channel = this.channels[channelNumber];
         channel.expression = expression / 127;
-        this.updateChannelGain(channel);
+        this.updateChannelVolume(channel);
     }
     dataEntryLSB(channelNumber, value) {
         this.channels[channelNumber].dataLSB = value;
         this.handleRPN(channelNumber, 0);
     }
-    updateChannelGain(channel) {
+    updateChannelVolume(channel) {
         const now = this.audioContext.currentTime;
         const volume = channel.volume * channel.expression;
         const { gainLeft, gainRight } = this.panToGain(channel.pan);
@@ -992,11 +994,12 @@ class MidyGM1 {
         }
     }
     GM1SystemOn() {
-        this.channels.forEach((channel) => {
+        for (let i = 0; i < this.channels.length; i++) {
+            const channel = this.channels[i];
             channel.bankMSB = 0;
             channel.bankLSB = 0;
             channel.bank = 0;
-        });
+        }
         this.channels[9].bankMSB = 1;
         this.channels[9].bank = 128;
     }

package/script/midy-GM2.d.ts

@@ -144,7 +144,7 @@ export class MidyGM2 {
     createChannels(audioContext: any): any[];
     createNoteBuffer(instrumentKey: any, isSF3: any): Promise<any>;
     createNoteBufferNode(instrumentKey: any, isSF3: any): Promise<any>;
-    convertToFloat32Array(uint8Array: any): Float32Array;
+    findPortamentoTarget(queueIndex: any): any;
     scheduleTimelineEvents(t: any, offset: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
     playNotes(): Promise<any>;
@@ -154,8 +154,8 @@ export class MidyGM2 {
         instruments: Set<any>;
         timeline: any[];
     };
-    stopChannelNotes(channelNumber: any, velocity: any, stopPedal: any): Promise<void>;
-    stopNotes(velocity: any, stopPedal: any): Promise<any[]>;
+    stopChannelNotes(channelNumber: any, velocity: any, force: any): Promise<void>;
+    stopNotes(velocity: any, force: any): Promise<any[]>;
     start(): Promise<void>;
     stop(): void;
     pause(): void;
@@ -191,18 +191,21 @@ export class MidyGM2 {
     centToHz(cent: any): number;
     calcSemitoneOffset(channel: any): any;
     calcPlaybackRate(instrumentKey: any, noteNumber: any, semitoneOffset: any): number;
+    setPortamentoStartVolumeEnvelope(channel: any, note: any): void;
     setVolumeEnvelope(note: any): void;
     setPitch(note: any, semitoneOffset: any): void;
     clampCutoffFrequency(frequency: any): number;
+    setPortamentoStartFilterEnvelope(channel: any, note: any): void;
     setFilterEnvelope(channel: any, note: any): void;
     startModulation(channel: any, note: any, startTime: any): void;
     startVibrato(channel: any, note: any, startTime: any): void;
-    createNote(channel: any, instrumentKey: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
+    createNote(channel: any, instrumentKey: any, noteNumber: any, velocity: any, startTime: any, portamento: any, isSF3: any): Promise<Note>;
     calcBank(channel: any, channelNumber: any): any;
-    scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
-    noteOn(channelNumber: any, noteNumber: any, velocity: any): Promise<void>;
-    scheduleNoteRelease(channelNumber: any, noteNumber: any, _velocity: any, stopTime: any, stopPedal?: boolean): Promise<any> | undefined;
-    releaseNote(channelNumber: any, noteNumber: any, velocity: any): Promise<any> | undefined;
+    scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any, portamento: any): Promise<void>;
+    noteOn(channelNumber: any, noteNumber: any, velocity: any, portamento: any): Promise<void>;
+    stopNote(stopTime: any, endTime: any, scheduledNotes: any, index: any): Promise<any>;
+    scheduleNoteRelease(channelNumber: any, noteNumber: any, _velocity: any, stopTime: any, portamentoNoteNumber: any, force: any): Promise<any> | undefined;
+    releaseNote(channelNumber: any, noteNumber: any, velocity: any, portamentoNoteNumber: any): Promise<any> | undefined;
     releaseSustainPedal(channelNumber: any, halfVelocity: any): any[];
     releaseSostenutoPedal(channelNumber: any, halfVelocity: any): any[];
     handleMIDIMessage(statusByte: any, data1: any, data2: any): void | Promise<any>;
@@ -250,7 +253,7 @@ export class MidyGM2 {
     setExpression(channelNumber: any, expression: any): void;
     setBankLSB(channelNumber: any, lsb: any): void;
     dataEntryLSB(channelNumber: any, value: any): void;
-    updateChannelGain(channel: any): void;
+    updateChannelVolume(channel: any): void;
     setSustainPedal(channelNumber: any, value: any): void;
     setPortamento(channelNumber: any, value: any): void;
     setReverbSendLevel(channelNumber: any, reverbSendLevel: any): void;

package/script/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":"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"}