@marmooo/midy 0.0.2 → 0.0.3

package/esm/midy.js

@@ -8,12 +8,6 @@ export class Midy {
             writable: true,
             value: 120
         });
-        Object.defineProperty(this, "secondsPerBeat", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 0.5
-        });
         Object.defineProperty(this, "totalTime", {
             enumerable: true,
             configurable: true,
@@ -174,10 +168,10 @@ export class Midy {
         const response = await fetch(midiUrl);
         const arrayBuffer = await response.arrayBuffer();
         const midi = parseMidi(new Uint8Array(arrayBuffer));
+        this.ticksPerBeat = midi.header.ticksPerBeat;
         const midiData = this.extractMidiData(midi);
         this.instruments = midiData.instruments;
         this.timeline = midiData.timeline;
-        this.ticksPerBeat = midi.header.ticksPerBeat;
         this.totalTime = this.calcTotalTime();
     }
     setChannelAudioNodes(audioContext) {
@@ -263,18 +257,20 @@ export class Midy {
     async scheduleTimelineEvents(t, offset, queueIndex) {
         while (queueIndex < this.timeline.length) {
             const event = this.timeline[queueIndex];
-            const time = this.ticksToSecond(event.ticks, this.secondsPerBeat);
-            if (time > t + this.lookAhead)
+            if (event.startTime > t + this.lookAhead)
                 break;
             switch (event.type) {
                 case "controller":
                     this.handleControlChange(this.omni ? 0 : event.channel, event.controllerType, event.value);
                     break;
                 case "noteOn":
-                    await this.scheduleNoteOn(this.omni ? 0 : event.channel, event.noteNumber, event.velocity, time + this.startDelay - offset);
-                    break;
+                    if (event.velocity !== 0) {
+                        await this.scheduleNoteOn(event.channel, event.noteNumber, event.velocity, event.startTime + this.startDelay - offset);
+                        break;
+                    }
+                /* falls through */
                 case "noteOff": {
-                    const notePromise = this.scheduleNoteRelease(this.omni ? 0 : event.channel, event.noteNumber, event.velocity, time + this.startDelay - offset);
+                    const notePromise = this.scheduleNoteRelease(this.omni ? 0 : event.channel, event.noteNumber, event.velocity, event.startTime + this.startDelay - offset);
                     if (notePromise) {
                         this.notePromises.push(notePromise);
                     }
@@ -283,9 +279,6 @@ export class Midy {
                 case "programChange":
                     this.handleProgramChange(event.channel, event.programNumber);
                     break;
-                case "setTempo":
-                    this.secondsPerBeat = event.microsecondsPerBeat / 1000000;
-                    break;
                 case "sysEx":
                     this.handleSysEx(event.data);
             }
@@ -294,9 +287,8 @@ export class Midy {
         return queueIndex;
     }
     getQueueIndex(second) {
-        const ticks = this.secondToTicks(second, this.secondsPerBeat);
         for (let i = 0; i < this.timeline.length; i++) {
-            if (ticks <= this.timeline[i].ticks) {
+            if (second <= this.timeline[i].startTime) {
                 return i;
             }
         }
@@ -438,18 +430,28 @@ export class Midy {
                 timeline.push(event);
             });
         });
+        const priority = {
+            setTempo: 0,
+            controller: 1,
+        };
         timeline.sort((a, b) => {
-            if (a.ticks !== b.ticks) {
+            if (a.ticks !== b.ticks)
                 return a.ticks - b.ticks;
-            }
-            if (a.type !== "controller" && b.type === "controller") {
-                return -1;
-            }
-            if (a.type === "controller" && b.type !== "controller") {
-                return 1;
-            }
-            return 0;
+            return (priority[a.type] || 2) - (priority[b.type] || 2);
         });
+        let prevTempoTime = 0;
+        let prevTempoTicks = 0;
+        let secondsPerBeat = 0.5;
+        for (let i = 0; i < timeline.length; i++) {
+            const event = timeline[i];
+            const timeFromPrevTempo = this.ticksToSecond(event.ticks - prevTempoTicks, secondsPerBeat);
+            event.startTime = prevTempoTime + timeFromPrevTempo;
+            if (event.type === "setTempo") {
+                prevTempoTime += this.ticksToSecond(event.ticks - prevTempoTicks, secondsPerBeat);
+                secondsPerBeat = event.microsecondsPerBeat / 1000000;
+                prevTempoTicks = event.ticks;
+            }
+        }
         return { instruments, timeline };
     }
     stopNotes() {
@@ -501,32 +503,12 @@ export class Midy {
         }
     }
     calcTotalTime() {
-        const endOfTracks = [];
-        let prevTicks = 0;
         let totalTime = 0;
-        let secondsPerBeat = 0.5;
         for (let i = 0; i < this.timeline.length; i++) {
             const event = this.timeline[i];
-            switch (event.type) {
-                case "setTempo": {
-                    const durationTicks = event.ticks - prevTicks;
-                    totalTime += this.ticksToSecond(durationTicks, secondsPerBeat);
-                    secondsPerBeat = event.microsecondsPerBeat / 1000000;
-                    prevTicks = event.ticks;
-                    break;
-                }
-                case "endOfTrack":
-                    endOfTracks.push(event);
-            }
-        }
-        let maxTicks = 0;
-        for (let i = 0; i < endOfTracks.length; i++) {
-            const event = endOfTracks[i];
-            if (maxTicks < event.ticks)
-                maxTicks = event.ticks;
+            if (totalTime < event.startTime)
+                totalTime = event.startTime;
         }
-        const durationTicks = maxTicks - prevTicks;
-        totalTime += this.ticksToSecond(durationTicks, secondsPerBeat);
         return totalTime;
     }
     currentTime() {
@@ -554,11 +536,8 @@ export class Midy {
         const lfo = new OscillatorNode(audioContext, {
             frequency: 5,
         });
-        const lfoGain = new GainNode(audioContext);
-        lfo.connect(lfoGain);
         return {
             lfo,
-            lfoGain,
         };
     }
     createReverbEffect(audioContext, options = {}) {
@@ -690,12 +669,6 @@ export class Midy {
             .exponentialRampToValueAtTime(attackVolume, volAttack)
             .setValueAtTime(attackVolume, volHold)
             .linearRampToValueAtTime(sustainVolume, volDecay);
-        if (channel.modulation > 0) {
-            const lfoGain = channel.modulationEffect.lfoGain;
-            lfoGain.connect(bufferSource.detune);
-            lfoGain.gain.cancelScheduledValues(startTime + channel.vibratoDelay);
-            lfoGain.gain.setValueAtTime(channel.modulation, startTime + channel.vibratoDelay);
-        }
         // filter envelope
         const softPedalFactor = 1 -
             (0.1 + (noteNumber / 127) * 0.2) * channel.softPedal;
@@ -721,6 +694,19 @@ export class Midy {
             .exponentialRampToValueAtTime(adjustedPeekFreq, modAttack)
             .setValueAtTime(adjustedPeekFreq, modHold)
             .linearRampToValueAtTime(adjustedSustainFreq, modDecay);
+        let lfoGain;
+        if (channel.modulation > 0) {
+            const vibratoDelay = startTime + channel.vibratoDelay;
+            const vibratoAttack = vibratoDelay + 0.1;
+            lfoGain = new GainNode(this.audioContext, {
+                gain: 0,
+            });
+            lfoGain.gain
+                .setValueAtTime(1e-6, vibratoDelay) // exponentialRampToValueAtTime() requires a non-zero value
+                .exponentialRampToValueAtTime(channel.modulation, vibratoAttack);
+            channel.modulationEffect.lfo.connect(lfoGain);
+            lfoGain.connect(bufferSource.detune);
+        }
         bufferSource.connect(filterNode);
         filterNode.connect(gainNode);
         if (this.mono && channel.currentBufferSource) {
@@ -764,11 +750,12 @@ export class Midy {
         }
         const scheduledNotes = channel.scheduledNotes;
         const scheduledNote = {
-            gainNode,
-            filterNode,
             bufferSource,
-            noteNumber,
+            filterNode,
+            gainNode,
+            lfoGain,
             noteInfo,
+            noteNumber,
             startTime,
         };
         if (scheduledNotes.has(noteNumber)) {
@@ -797,7 +784,7 @@ export class Midy {
                 continue;
             if (targetNote.ending)
                 continue;
-            const { bufferSource, filterNode, gainNode, noteInfo } = targetNote;
+            const { bufferSource, filterNode, gainNode, lfoGain, noteInfo } = targetNote;
             const velocityRate = (velocity + 127) / 127;
             const volEndTime = stopTime + noteInfo.volRelease * velocityRate;
             gainNode.gain.cancelScheduledValues(stopTime);
@@ -819,6 +806,8 @@ export class Midy {
                     bufferSource.disconnect(0);
                     filterNode.disconnect(0);
                     gainNode.disconnect(0);
+                    if (lfoGain)
+                        lfoGain.disconnect(0);
                     resolve();
                 };
                 bufferSource.stop(volEndTime);
@@ -829,41 +818,34 @@ export class Midy {
         const now = this.audioContext.currentTime;
         return this.scheduleNoteRelease(channelNumber, noteNumber, velocity, now);
     }
-    releaseSustainPedal(channelNumber) {
-        const now = this.audioContext.currentTime;
+    releaseSustainPedal(channelNumber, halfVelocity) {
+        const velocity = halfVelocity * 2;
         const channel = this.channels[channelNumber];
+        const promises = [];
         channel.sustainPedal = false;
         channel.scheduledNotes.forEach((scheduledNotes) => {
             scheduledNotes.forEach((scheduledNote) => {
                 if (scheduledNote) {
-                    const { bufferSource, gainNode, filterNode, noteInfo } = scheduledNote;
-                    const volEndTime = now + noteInfo.volRelease;
-                    gainNode.gain.cancelScheduledValues(now);
-                    gainNode.gain.linearRampToValueAtTime(0, volEndTime);
-                    const maxFreq = this.audioContext.sampleRate / 2;
-                    const baseFreq = this.centToHz(noteInfo.initialFilterFc);
-                    const adjustedBaseFreq = Math.min(maxFreq, baseFreq);
-                    const modEndTime = now + noteInfo.modRelease;
-                    filterNode.frequency
-                        .cancelScheduledValues(stopTime)
-                        .linearRampToValueAtTime(adjustedBaseFreq, modEndTime);
-                    bufferSource.stop(volEndTime);
+                    const { noteNumber } = scheduledNote;
+                    const promise = this.releaseNote(channelNumber, noteNumber, velocity);
+                    promises.push(promise);
                 }
             });
         });
+        return promises;
     }
-    releaseSostenuto(channelNumber) {
-        const now = this.audioContext.currentTime;
+    releaseSostenutoPedal(channelNumber, halfVelocity) {
+        const velocity = halfVelocity * 2;
         const channel = this.channels[channelNumber];
+        const promises = [];
         channel.sostenutoPedal = false;
         channel.sostenutoNotes.forEach((activeNote) => {
-            const { gainNode, bufferSource, noteInfo } = activeNote;
-            const fadeTime = noteInfo.volRelease;
-            gainNode.gain.cancelScheduledValues(now);
-            gainNode.gain.linearRampToValueAtTime(0, now + fadeTime);
-            bufferSource.stop(now + fadeTime);
+            const { noteNumber } = activeNote;
+            const promise = this.releaseNote(channelNumber, noteNumber, velocity);
+            promises.push(promise);
         });
         channel.sostenutoNotes.clear();
+        return promises;
     }
     handleMIDIMessage(statusByte, data1, data2) {
         const channelNumber = omni ? 0 : statusByte & 0x0F;
@@ -984,13 +966,9 @@ export class Midy {
         this.channels[channelNumber].bankMSB = msb;
     }
     setModulation(channelNumber, modulation) {
-        const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.modulation = (modulation * 100 / 127) *
-            channel.modulationDepthRange;
-        const lfoGain = channel.modulationEffect.lfoGain;
-        lfoGain.gain.cancelScheduledValues(now);
-        lfoGain.gain.setValueAtTime(channel.modulation, now);
+        channel.modulation = (modulation / 127) *
+            (channel.modulationDepthRange * 100);
     }
     setPortamentoTime(channelNumber, portamentoTime) {
         this.channels[channelNumber].portamentoTime = portamentoTime / 127;
@@ -1025,7 +1003,7 @@ export class Midy {
         const isOn = value >= 64;
         this.channels[channelNumber].sustainPedal = isOn;
         if (!isOn) {
-            this.releaseSustainPedal(channelNumber);
+            this.releaseSustainPedal(channelNumber, value);
         }
     }
     setPortamento(channelNumber, value) {
@@ -1054,25 +1032,29 @@ export class Midy {
             const activeNotes = this.getActiveNotes(channel);
             channel.sostenutoNotes = new Map(activeNotes);
         }
+        else {
+            this.releaseSostenutoPedal(channelNumber, value);
+        }
     }
     setSoftPedal(channelNumber, softPedal) {
         const channel = this.channels[channelNumber];
         channel.softPedal = softPedal / 127;
-        this.updateChannelGain(channel);
     }
     setVibratoRate(channelNumber, vibratoRate) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.vibratoRate = vibratoRate / 127 * 4 + 3; // 3-7Hz
-        channel.modulationEffect.lfo.frequency.cancelScheduledValues(now);
-        channel.modulationEffect.lfo.frequency.setValueAtTime(depth, now);
+        channel.modulationEffect.lfo.frequency
+            .cancelScheduledValues(now)
+            .setValueAtTime(channel.vibratoRate, now);
     }
     setVibratoDepth(channelNumber, vibratoDepth) {
         const now = this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
         channel.vibratoDepth = vibratoDepth / 127;
-        channel.modulationEffect.lfoGain.gain.cancelScheduledValues(now);
-        channel.modulationEffect.lfoGain.gain.setValueAtTime(depth, now);
+        channel.modulationEffect.lfoGain.gain
+            .cancelScheduledValues(now)
+            .setValueAtTime(channel.vibratoDepth, now);
     }
     setVibratoDelay(channelNumber, vibratoDelay) {
         // Access Virus: 0-10sec
@@ -1343,7 +1325,7 @@ Object.defineProperty(Midy, "channelSettings", {
     writable: true,
     value: {
         currentBufferSource: null,
-        volume: 1,
+        volume: 100 / 127,
         pan: 0,
         portamentoTime: 0,
         reverb: 0,
@@ -1360,7 +1342,7 @@ Object.defineProperty(Midy, "channelSettings", {
         pitchBend: 0,
         fineTuning: 0,
         coarseTuning: 0,
-        modulationDepthRange: 2,
+        modulationDepthRange: 0.5,
     }
 });
 Object.defineProperty(Midy, "effectSettings", {

package/package.json

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

@@ -24,7 +24,6 @@ export class MidyGM1 {
     };
     constructor(audioContext: any);
     ticksPerBeat: number;
-    secondsPerBeat: number;
     totalTime: number;
     noteCheckInterval: number;
     lookAhead: number;
@@ -50,7 +49,6 @@ export class MidyGM1 {
         pannerNode: any;
         modulationEffect: {
             lfo: any;
-            lfoGain: any;
         };
         expression: number;
         modulation: number;
@@ -81,7 +79,6 @@ export class MidyGM1 {
         pannerNode: any;
         modulationEffect: {
             lfo: any;
-            lfoGain: any;
         };
     };
     createChannels(audioContext: any): {
@@ -91,7 +88,6 @@ export class MidyGM1 {
         pannerNode: any;
         modulationEffect: {
             lfo: any;
-            lfoGain: any;
         };
         expression: number;
         modulation: number;
@@ -137,12 +133,6 @@ export class MidyGM1 {
     getActiveChannelNotes(scheduledNotes: any): any;
     createModulationEffect(audioContext: any): {
         lfo: any;
-        lfoGain: any;
-    };
-    createReverbEffect(audioContext: any, options?: {}): {
-        convolverNode: any;
-        dryGain: any;
-        wetGain: any;
     };
     connectNoteEffects(channel: any, gainNode: any): void;
     cbToRatio(cb: any): number;
@@ -151,12 +141,13 @@ export class MidyGM1 {
         bufferSource: any;
         gainNode: any;
         filterNode: any;
+        lfoGain: 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;
-    releaseSustainPedal(channelNumber: any): void;
+    releaseSustainPedal(channelNumber: any, halfVelocity: any): any[];
     handleMIDIMessage(statusByte: any, data1: any, data2: any): void | any[] | Promise<any>;
     handlePolyphonicKeyPressure(channelNumber: any, noteNumber: any, pressure: any): void;
     handleProgramChange(channelNumber: any, program: any): void;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAMA;IAoBE;;;;;;;;;;;;;;MAcE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAlDD,qBAAmB;IACnB,uBAAqB;IACrB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IA4BhB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;;MAgBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAWC;IAED,0DAyBC;IAED,8DAUC;IAED,qDAOC;IAED,2EA6CC;IAED,mCAQC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MA0DC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBA2BC;IAED,sBAGC;IAED,4CASC;IAED,gDAKC;IAED;;;MAUC;IAED;;;;MAoCC;IAED,sDAEC;IAED,2BAEC;IAED,4BAEC;IAED;;;;OAwEC;IAED,kGAsCC;IAED,0EAGC;IAED,sIA0CC;IAED,0FAGC;IAED,8CAuBC;IAED,wFAqBC;IAED,sFAeC;IAED,4DAGC;IAED,+DAEC;IAED,8DAGC;IAED,mFA+BC;IAED,yDAQC;IAED,iDAIC;IAED,2CAMC;IAED,yDAIC;IAED,sCAKC;IAED,sDAMC;IAED,gDAEC;IAED,gDAEC;IAED,+DAoBC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,sCAIC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF"}
+{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAMA;IAmBE;;;;;;;;;;;;;;MAcE;IAEF;;;;;;;MAOE;IAEF,+BAMC;IAjDD,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,mBAAiB;IACjB,oBAAkB;IA4BhB,kBAAgC;IAChC,gBAA4C;IAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAiD;IAInD,4BAMC;IAED,mCASC;IAED,gDAMC;IAED,sCASC;IAED;;;;;;MAgBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;QAWC;IAED,0DAyBC;IAED,8DAUC;IAED,qDAOC;IAED,2EA4CC;IAED,mCAOC;IAED,0BA+CC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAyEC;IAED,4BAsBC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,4CASC;IAED,gDAKC;IAED;;MAOC;IAED,sDAEC;IAED,2BAEC;IAED,4BAEC;IAED;;;;;OA6EC;IAED,kGAuCC;IAED,0EAGC;IAED,sIA4CC;IAED,0FAGC;IAED,kEAeC;IAED,wFAqBC;IAED,sFAeC;IAED,4DAGC;IAED,+DAEC;IAED,8DAGC;IAED,mFA+BC;IAED,yDAIC;IAED,iDAIC;IAED,2CAMC;IAED,yDAIC;IAED,sCAKC;IAED,sDAMC;IAED,gDAEC;IAED,gDAEC;IAED,+DAoBC;IAED,uCAoBC;IAED,8CAEC;IAED,uCAoBC;IAED,4DAgBC;IAED,oBAQC;IAED,yDAaC;IAED,yCAGC;IAED,sCAIC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF"}