@marmooo/midy 0.4.0 → 0.4.1

package/esm/midy-GMLite.js

@@ -99,11 +99,11 @@ const defaultControllerState = {
     pitchWheel: { type: 14, defaultValue: 8192 / 16383 },
     pitchWheelSensitivity: { type: 16, defaultValue: 2 / 128 },
     link: { type: 127, defaultValue: 0 },
-    modulationDepth: { type: 128 + 1, defaultValue: 0 },
+    modulationDepthMSB: { type: 128 + 1, defaultValue: 0 },
     // dataMSB: { type: 128 + 6, defaultValue: 0, },
-    volume: { type: 128 + 7, defaultValue: 100 / 127 },
-    pan: { type: 128 + 10, defaultValue: 64 / 127 },
-    expression: { type: 128 + 11, defaultValue: 1 },
+    volumeMSB: { type: 128 + 7, defaultValue: 100 / 127 },
+    panMSB: { type: 128 + 10, defaultValue: 64 / 127 },
+    expressionMSB: { type: 128 + 11, defaultValue: 1 },
     // dataLSB: { type: 128 + 38, defaultValue: 0, },
     sustainPedal: { type: 128 + 64, defaultValue: 0 },
     // rpnLSB: { type: 128 + 100, defaultValue: 127 },
@@ -429,7 +429,7 @@ export class MidyGMLite {
         return soundFontIndex * (2 ** 32) + (instrument << 16) + sampleID;
     }
     createChannelAudioNodes(audioContext) {
-        const { gainLeft, gainRight } = this.panToGain(defaultControllerState.pan.defaultValue);
+        const { gainLeft, gainRight } = this.panToGain(defaultControllerState.panMSB.defaultValue);
         const gainL = new GainNode(audioContext, { gain: gainLeft });
         const gainR = new GainNode(audioContext, { gain: gainRight });
         const merger = new ChannelMergerNode(audioContext, { numberOfInputs: 2 });
@@ -457,10 +457,9 @@ export class MidyGMLite {
         return channels;
     }
     async createAudioBuffer(voiceParams) {
-        const sample = voiceParams.sample;
-        const sampleStart = voiceParams.start;
-        const sampleEnd = sample.data.length + voiceParams.end;
-        const audioBuffer = await sample.toAudioBuffer(this.audioContext, sampleStart, sampleEnd);
+        const { sample, start, end } = voiceParams;
+        const sampleEnd = sample.data.length + end;
+        const audioBuffer = await sample.toAudioBuffer(this.audioContext, start, sampleEnd);
         return audioBuffer;
     }
     createBufferSource(channel, voiceParams, audioBuffer) {
@@ -490,9 +489,7 @@ export class MidyGMLite {
                     await this.noteOn(event.channel, event.noteNumber, event.velocity, startTime);
                     break;
                 case "noteOff": {
-                    const notePromise = this.noteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
-                    if (notePromise)
-                        this.notePromises.push(notePromise);
+                    this.noteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
                     break;
                 }
                 case "controller":
@@ -586,6 +583,12 @@ export class MidyGMLite {
             const waitTime = now + this.noteCheckInterval;
             await this.scheduleTask(() => { }, waitTime);
         }
+        if (this.timeline.length <= queueIndex) {
+            const now = this.audioContext.currentTime;
+            await this.stopNotes(0, true, now);
+            await this.audioContext.suspend();
+            finished = true;
+        }
         if (finished) {
             this.notePromises = [];
             this.resetAllStates();
@@ -918,12 +921,18 @@ export class MidyGMLite {
         this.setFilterEnvelope(note, now);
         this.setPitchEnvelope(note, now);
         this.updateDetune(channel, note, now);
-        if (0 < state.modulationDepth) {
+        if (0 < state.modulationDepthMSB) {
             this.startModulation(channel, note, now);
         }
         note.bufferSource.connect(note.filterNode);
         note.filterNode.connect(note.volumeEnvelopeNode);
-        note.bufferSource.start(startTime);
+        if (voiceParams.sample.type === "compressed") {
+            const offset = voiceParams.start / audioBuffer.sampleRate;
+            note.bufferSource.start(startTime, offset);
+        }
+        else {
+            note.bufferSource.start(startTime);
+        }
         return note;
     }
     handleExclusiveClass(note, channelNumber, startTime) {
@@ -1045,7 +1054,9 @@ export class MidyGMLite {
         }
         note.ending = true;
         this.setNoteIndex(channel, index);
-        this.releaseNote(channel, note, endTime);
+        const promise = this.releaseNote(channel, note, endTime);
+        this.notePromises.push(promise);
+        return promise;
     }
     setNoteIndex(channel, index) {
         let allEnds = true;
@@ -1143,11 +1154,12 @@ export class MidyGMLite {
     setModLfoToPitch(channel, note, scheduleTime) {
         if (note.modulationDepth) {
             const modLfoToPitch = note.voiceParams.modLfoToPitch;
-            const baseDepth = Math.abs(modLfoToPitch) + channel.state.modulationDepth;
-            const modulationDepth = baseDepth * Math.sign(modLfoToPitch);
+            const baseDepth = Math.abs(modLfoToPitch) +
+                channel.state.modulationDepthMSB;
+            const depth = baseDepth * Math.sign(modLfoToPitch);
             note.modulationDepth.gain
                 .cancelScheduledValues(scheduleTime)
-                .setValueAtTime(modulationDepth, scheduleTime);
+                .setValueAtTime(depth, scheduleTime);
         }
         else {
             this.startModulation(channel, note, scheduleTime);
@@ -1184,18 +1196,18 @@ export class MidyGMLite {
     createVoiceParamsHandlers() {
         return {
             modLfoToPitch: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                if (0 < channel.state.modulationDepthMSB) {
                     this.setModLfoToPitch(channel, note, scheduleTime);
                 }
             },
             vibLfoToPitch: (_channel, _note, _scheduleTime) => { },
             modLfoToFilterFc: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                if (0 < channel.state.modulationDepthMSB) {
                     this.setModLfoToFilterFc(note, scheduleTime);
                 }
             },
             modLfoToVolume: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                if (0 < channel.state.modulationDepthMSB) {
                     this.setModLfoToVolume(note, scheduleTime);
                 }
             },
@@ -1433,8 +1445,8 @@ export class MidyGMLite {
     resetAllControllers(channelNumber, _value, scheduleTime) {
         const keys = [
             "pitchWheel",
-            "expression",
-            "modulationDepth",
+            "expressionMSB",
+            "modulationDepthMSB",
             "sustainPedal",
         ];
         const channel = this.channels[channelNumber];

package/esm/midy.d.ts

@@ -13,6 +13,7 @@ export class Midy {
         modulationDepthRange: number;
         fineTuning: number;
         coarseTuning: number;
+        portamentoControl: boolean;
     };
     constructor(audioContext: any);
     mode: string;
@@ -182,11 +183,11 @@ export class Midy {
     noteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     disconnectNote(note: any): void;
     releaseNote(channel: any, note: any, endTime: any): Promise<any>;
-    noteOff(channelNumber: any, noteNumber: any, velocity: any, endTime: any, force: any): void;
+    noteOff(channelNumber: any, noteNumber: any, velocity: any, endTime: any, force: any): Promise<any> | undefined;
     setNoteIndex(channel: any, index: any): void;
     findNoteOffIndex(channel: any, noteNumber: any): any;
-    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): void[];
-    releaseSostenutoPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): void[];
+    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): (Promise<any> | undefined)[];
+    releaseSostenutoPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): (Promise<any> | undefined)[];
     createMessageHandlers(): any[];
     handleMessage(data: any, scheduleTime: any): void;
     activeSensing(): void;
@@ -223,16 +224,16 @@ export class Midy {
     setControlChange(channelNumber: any, controllerType: any, value: any, scheduleTime: any): void;
     setBankMSB(channelNumber: any, msb: any): void;
     updateModulation(channel: any, scheduleTime: any): void;
-    setModulationDepth(channelNumber: any, modulation: any, scheduleTime: any): void;
+    setModulationDepth(channelNumber: any, value: any, scheduleTime: any): void;
     updatePortamento(channel: any, scheduleTime: any): void;
-    setPortamentoTime(channelNumber: any, portamentoTime: any, scheduleTime: any): void;
-    setVolume(channelNumber: any, volume: any, scheduleTime: any): void;
+    setPortamentoTime(channelNumber: any, value: any, scheduleTime: any): void;
+    setVolume(channelNumber: any, value: any, scheduleTime: any): void;
     panToGain(pan: any): {
         gainLeft: number;
         gainRight: number;
     };
-    setPan(channelNumber: any, pan: any, scheduleTime: any): void;
-    setExpression(channelNumber: any, expression: any, scheduleTime: any): void;
+    setPan(channelNumber: any, value: any, scheduleTime: any): void;
+    setExpression(channelNumber: any, value: any, scheduleTime: any): void;
     setBankLSB(channelNumber: any, lsb: any): void;
     dataEntryLSB(channelNumber: any, value: any, scheduleTime: any): void;
     updateChannelVolume(channel: any, scheduleTime: any): void;
@@ -252,6 +253,7 @@ export class Midy {
     setVibratoRate(channelNumber: any, vibratoRate: any, scheduleTime: any): void;
     setVibratoDepth(channelNumber: any, vibratoDepth: any, scheduleTime: any): void;
     setVibratoDelay(channelNumber: any, vibratoDelay: any, scheduleTime: any): void;
+    setPortamentoNoteNumber(channelNumber: any, value: any, scheduleTime: any): void;
     setReverbSendLevel(channelNumber: any, reverbSendLevel: any, scheduleTime: any): void;
     setChorusSendLevel(channelNumber: any, chorusSendLevel: any, scheduleTime: any): void;
     limitData(channel: any, minMSB: any, maxMSB: any, minLSB: any, maxLSB: any): void;

package/esm/midy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"midy.d.ts","sourceRoot":"","sources":["../src/midy.js"],"names":[],"mappings":"AAmKA;IA6CE;;;;;;;;;;;;;;;MAeE;IAEF,+BAoBC;IAjFD,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,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,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,gBAAiD;IACjD;;;kBAAyD;IACzD;;;;;;;;MAAyD;IAQ3D,mCASC;IAED,2DAYC;IAED,yCAmBC;IAED,oCASC;IAED,sBAoCC;IAED,8DAYC;IAED;;;;MAeC;IAED,sCAMC;IAED,yCAqBC;IAED,kDASC;IAED,mDAIC;IAED,2FAWC;IAED,yEA+DC;IAED,mCAOC;IAED,uBASC;IAED,yDA2BC;IAED,2BAwDC;IAED,uDAEC;IAED,wDAEC;IAED,qCAMC;IAED;;;MAqFC;IAED,kGAeC;IAED,mGAeC;IAED,wEAMC;IAED,uBAMC;IAED,sBAKC;IAED,uBAQC;IAED,wBAKC;IAED,0BAKC;IAED,wBAOC;IAED,sBAIC;IAED,yDAQC;IAED,yEASC;IAED,kFAuBC;IAED;;;;MASC;IAED,gFAUC;IAED,mFAYC;IAED,sGAcC;IAID;;;MA8BC;IAED;;;kBA6BC;IAED;;;;;;;;MA0CC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAkBC;IAED,6CAEC;IAED,2DAIC;IAED,+DAwBC;IAED,mDAMC;IAED,2CAoDC;IAED,8EAYC;IAED,oEAkBC;IAED,+DAKC;IAED,qDAoBC;IAED,6CAIC;IAED,8EAqBC;IAED,oEAyBC;IAED,kEAoBC;IAED,+DAcC;IAED,4GAkCC;IAED,uEAkEC;IAED,0EAiBC;IAED,8EAoBC;IAED,oEAuBC;IAED,0FAyBC;IAED,gCAmBC;IAED,iEAsBC;IAED,gHA6BC;IAED,6CAUC;IAED,qDAUC;IAED,4GAeC;IAED,8GAkBC;IAED,+BAyCC;IAED,kDAOC;IAED,sBAEC;IAED,sGAeC;IAED,mFAcC;IAED,4EAgBC;IAED,wFAGC;IAED,sEAWC;IAED,mEAcC;IAED,mEAaC;IAED,sEAMC;IAED,oEAQC;IAED,gEAyBC;IAED,gEAyBC;IAED,gCAKC;IAED,kDAKC;IAED,gEAMC;IAED,8CAOC;IAED;;;;;;;;;;;MAsDC;IAED,gHAQC;IAED,6EAgCC;IAED,qCA2CC;IAED,+FAYC;IAED,+CAEC;IAED,wDAWC;IAED,4EASC;IAED,wDAeC;IAED,2EASC;IAED,mEAcC;IAED;;;MAMC;IAED,gEAcC;IAED,uEAQC;IAED,+CAEC;IAED,sEAGC;IAED,2DAoBC;IAED,4EA6BC;IAED,yEAYC;IAED,+CAEC;IAED,uEAMC;IAED,2EAcC;IAED,oDAEC;IAED,0EAeC;IAED,8EAWC;IAED,4EAUC;IAED,8EAKC;IAED,4EAUC;IAED,4EAaC;IAED,0EAQC;IAED,8EASC;IAED,gFAeC;IAED,gFAUC;IAED,iFAKC;IAED,sFAQC;IAED,sFAQC;IAED,kFAeC;IAED,2DAMC;IAED,mEAyBC;IAGD,2DAGC;IAGD,2DAGC;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,8EAuCC;IAED,gFAGC;IAED,iEAEC;IAED,gEAEC;IAED,gEAIC;IAED,gEAIC;IAED,+EAuCC;IAED,qCAYC;IAED,qCAYC;IAED,4EAqEC;IAED,4DAGC;IAED,qDAKC;IAED,gEAIC;IAED,yDAWC;IAED,kEAGC;IAED,2DAWC;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,2FAoBC;IAED,iDAMC;IAED,wDAUC;IAED,qDAUC;IAED,kDAUC;IAED,mDAUC;IAED,sDAUC;IAED,yEAgBC;IAED,wEAaC;IAED,2CAIC;IAED,oFAOC;IAED,6DAcC;IAED,yEAIC;IAED,0CAuEC;IAED,yEAcC;IAED,gDAYC;IAGD,6DAgBC;CACF"}

package/esm/midy.js

@@ -158,14 +158,19 @@ const defaultControllerState = {
     pitchWheelSensitivity: { type: 16, defaultValue: 2 / 128 },
     link: { type: 127, defaultValue: 0 },
     // bankMSB: { type: 128 + 0, defaultValue: 121, },
-    modulationDepth: { type: 128 + 1, defaultValue: 0 },
-    portamentoTime: { type: 128 + 5, defaultValue: 0 },
+    modulationDepthMSB: { type: 128 + 1, defaultValue: 0 },
+    portamentoTimeMSB: { type: 128 + 5, defaultValue: 0 },
     // dataMSB: { type: 128 + 6, defaultValue: 0, },
-    volume: { type: 128 + 7, defaultValue: 100 / 127 },
-    pan: { type: 128 + 10, defaultValue: 64 / 127 },
-    expression: { type: 128 + 11, defaultValue: 1 },
+    volumeMSB: { type: 128 + 7, defaultValue: 100 / 127 },
+    panMSB: { type: 128 + 10, defaultValue: 64 / 127 },
+    expressionMSB: { type: 128 + 11, defaultValue: 1 },
     // bankLSB: { type: 128 + 32, defaultValue: 0, },
+    modulationDepthLSB: { type: 128 + 33, defaultValue: 0 },
+    portamentoTimeLSB: { type: 128 + 37, defaultValue: 0 },
     // dataLSB: { type: 128 + 38, defaultValue: 0, },
+    volumeLSB: { type: 128 + 39, defaultValue: 0 },
+    panLSB: { type: 128 + 42, defaultValue: 0 },
+    expressionLSB: { type: 128 + 43, defaultValue: 0 },
     sustainPedal: { type: 128 + 64, defaultValue: 0 },
     portamento: { type: 128 + 65, defaultValue: 0 },
     sostenutoPedal: { type: 128 + 66, defaultValue: 0 },
@@ -178,6 +183,7 @@ const defaultControllerState = {
     vibratoRate: { type: 128 + 76, defaultValue: 64 / 127 },
     vibratoDepth: { type: 128 + 77, defaultValue: 64 / 127 },
     vibratoDelay: { type: 128 + 78, defaultValue: 64 / 127 },
+    portamentoNoteNumber: { type: 128 + 84, defaultValue: 0 },
     reverbSendLevel: { type: 128 + 91, defaultValue: 0 },
     chorusSendLevel: { type: 128 + 93, defaultValue: 0 },
     // dataIncrement: { type: 128 + 96, defaultValue: 0 },
@@ -561,7 +567,7 @@ export class Midy {
         return soundFontIndex * (2 ** 32) + (instrument << 16) + sampleID;
     }
     createChannelAudioNodes(audioContext) {
-        const { gainLeft, gainRight } = this.panToGain(defaultControllerState.pan.defaultValue);
+        const { gainLeft, gainRight } = this.panToGain(defaultControllerState.panMSB.defaultValue);
         const gainL = new GainNode(audioContext, { gain: gainLeft });
         const gainR = new GainNode(audioContext, { gain: gainRight });
         const merger = new ChannelMergerNode(audioContext, { numberOfInputs: 2 });
@@ -604,10 +610,9 @@ export class Midy {
         return channels;
     }
     async createAudioBuffer(voiceParams) {
-        const sample = voiceParams.sample;
-        const sampleStart = voiceParams.start;
-        const sampleEnd = sample.data.length + voiceParams.end;
-        const audioBuffer = await sample.toAudioBuffer(this.audioContext, sampleStart, sampleEnd);
+        const { sample, start, end } = voiceParams;
+        const sampleEnd = sample.data.length + end;
+        const audioBuffer = await sample.toAudioBuffer(this.audioContext, start, sampleEnd);
         return audioBuffer;
     }
     isLoopDrum(channel, noteNumber) {
@@ -642,9 +647,7 @@ export class Midy {
                     await this.noteOn(event.channel, event.noteNumber, event.velocity, startTime);
                     break;
                 case "noteOff": {
-                    const notePromise = this.noteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
-                    if (notePromise)
-                        this.notePromises.push(notePromise);
+                    this.noteOff(event.channel, event.noteNumber, event.velocity, startTime, false);
                     break;
                 }
                 case "noteAftertouch":
@@ -751,6 +754,12 @@ export class Midy {
             const waitTime = now + this.noteCheckInterval;
             await this.scheduleTask(() => { }, waitTime);
         }
+        if (this.timeline.length <= queueIndex) {
+            const now = this.audioContext.currentTime;
+            await this.stopNotes(0, true, now);
+            await this.audioContext.suspend();
+            finished = true;
+        }
         if (finished) {
             this.notePromises = [];
             this.resetAllStates();
@@ -1143,6 +1152,13 @@ export class Midy {
         const noteDetune = this.calcNoteDetune(channel, note);
         const pitchControl = this.getPitchControl(channel, note);
         const detune = channel.detune + noteDetune + pitchControl;
+        if (channel.portamentoControl) {
+            const state = channel.state;
+            const portamentoNoteNumber = Math.ceil(state.portamentoNoteNumber * 127);
+            note.portamentoNoteNumber = portamentoNoteNumber;
+            channel.portamentoControl = false;
+            state.portamentoNoteNumber = 0;
+        }
         if (this.isPortamento(channel, note)) {
             const startTime = note.startTime;
             const deltaCent = (note.noteNumber - note.portamentoNoteNumber) * 100;
@@ -1159,8 +1175,10 @@ export class Midy {
         }
     }
     getPortamentoTime(channel, note) {
+        const { portamentoTimeMSB, portamentoTimeLSB } = channel.state;
+        const portamentoTime = portamentoTimeMSB + portamentoTimeLSB / 128;
         const deltaSemitone = Math.abs(note.noteNumber - note.portamentoNoteNumber);
-        const value = Math.ceil(channel.state.portamentoTime * 127);
+        const value = Math.ceil(portamentoTime * 128);
         return deltaSemitone / this.getPitchIncrementSpeed(value) / 10;
     }
     getPitchIncrementSpeed(value) {
@@ -1424,7 +1442,7 @@ export class Midy {
         if (0 < state.vibratoDepth) {
             this.startVibrato(channel, note, now);
         }
-        if (0 < state.modulationDepth) {
+        if (0 < state.modulationDepthMSB + state.modulationDepthLSB) {
             this.startModulation(channel, note, now);
         }
         if (channel.mono && channel.currentBufferSource) {
@@ -1435,7 +1453,13 @@ export class Midy {
         note.filterNode.connect(note.volumeEnvelopeNode);
         this.setChorusSend(channel, note, now);
         this.setReverbSend(channel, note, now);
-        note.bufferSource.start(startTime);
+        if (voiceParams.sample.type === "compressed") {
+            const offset = voiceParams.start / audioBuffer.sampleRate;
+            note.bufferSource.start(startTime, offset);
+        }
+        else {
+            note.bufferSource.start(startTime);
+        }
         return note;
     }
     handleExclusiveClass(note, channelNumber, startTime) {
@@ -1594,7 +1618,9 @@ export class Midy {
         }
         note.ending = true;
         this.setNoteIndex(channel, index);
-        this.releaseNote(channel, note, endTime);
+        const promise = this.releaseNote(channel, note, endTime);
+        this.notePromises.push(promise);
+        return promise;
     }
     setNoteIndex(channel, index) {
         let allEnds = true;
@@ -1747,9 +1773,11 @@ export class Midy {
     }
     setModLfoToPitch(channel, note, scheduleTime) {
         if (note.modulationDepth) {
+            const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+            const modulationDepth = modulationDepthMSB + modulationDepthLSB / 128;
             const modLfoToPitch = note.voiceParams.modLfoToPitch +
                 this.getLFOPitchDepth(channel, note);
-            const baseDepth = Math.abs(modLfoToPitch) + channel.state.modulationDepth;
+            const baseDepth = Math.abs(modLfoToPitch) + modulationDepth;
             const depth = baseDepth * Math.sign(modLfoToPitch);
             note.modulationDepth.gain
                 .cancelScheduledValues(scheduleTime)
@@ -1882,7 +1910,8 @@ export class Midy {
     createVoiceParamsHandlers() {
         return {
             modLfoToPitch: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+                if (0 < modulationDepthMSB + modulationDepthLSB) {
                     this.setModLfoToPitch(channel, note, scheduleTime);
                 }
             },
@@ -1892,12 +1921,14 @@ export class Midy {
                 }
             },
             modLfoToFilterFc: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+                if (0 < modulationDepthMSB + modulationDepthLSB) {
                     this.setModLfoToFilterFc(channel, note, scheduleTime);
                 }
             },
             modLfoToVolume: (channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+                if (0 < modulationDepthMSB + modulationDepthLSB) {
                     this.setModLfoToVolume(channel, note, scheduleTime);
                 }
             },
@@ -1908,12 +1939,14 @@ export class Midy {
                 this.setReverbSend(channel, note, scheduleTime);
             },
             delayModLFO: (_channel, note, _scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+                if (0 < modulationDepthMSB + modulationDepthLSB) {
                     this.setDelayModLFO(note);
                 }
             },
             freqModLFO: (_channel, note, scheduleTime) => {
-                if (0 < channel.state.modulationDepth) {
+                const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+                if (0 < modulationDepthMSB + modulationDepthLSB) {
                     this.setFreqModLFO(note, scheduleTime);
                 }
             },
@@ -1982,7 +2015,12 @@ export class Midy {
         handlers[10] = this.setPan;
         handlers[11] = this.setExpression;
         handlers[32] = this.setBankLSB;
+        handlers[33] = this.setModulationDepth;
+        handlers[37] = this.setPortamentoTime;
         handlers[38] = this.dataEntryLSB;
+        handlers[39] = this.setVolume;
+        handlers[42] = this.setPan;
+        handlers[43] = this.setExpression;
         handlers[64] = this.setSustainPedal;
         handlers[65] = this.setPortamento;
         handlers[66] = this.setSostenutoPedal;
@@ -1995,6 +2033,7 @@ export class Midy {
         handlers[76] = this.setVibratoRate;
         handlers[77] = this.setVibratoDepth;
         handlers[78] = this.setVibratoDelay;
+        handlers[84] = this.setPortamentoNoteNumber;
         handlers[91] = this.setReverbSendLevel;
         handlers[93] = this.setChorusSendLevel;
         handlers[96] = this.dataIncrement;
@@ -2026,7 +2065,9 @@ export class Midy {
         this.channels[channelNumber].bankMSB = msb;
     }
     updateModulation(channel, scheduleTime) {
-        const depth = channel.state.modulationDepth * channel.modulationDepthRange;
+        const { modulationDepthMSB, modulationDepthLSB } = channel.state;
+        const modulationDepth = modulationDepthMSB + modulationDepthLSB / 128;
+        const depth = modulationDepth * channel.modulationDepthRange;
         this.processScheduledNotes(channel, (note) => {
             if (note.modulationDepth) {
                 note.modulationDepth.gain.setValueAtTime(depth, scheduleTime);
@@ -2036,12 +2077,15 @@ export class Midy {
             }
         });
     }
-    setModulationDepth(channelNumber, modulation, scheduleTime) {
+    setModulationDepth(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
         if (channel.isDrum)
             return;
         scheduleTime ??= this.audioContext.currentTime;
-        channel.state.modulationDepth = modulation / 127;
+        const state = channel.state;
+        const intPart = Math.trunc(value);
+        state.modulationDepthMSB = intPart / 127;
+        state.modulationDepthLSB = value - intPart;
         this.updateModulation(channel, scheduleTime);
     }
     updatePortamento(channel, scheduleTime) {
@@ -2062,18 +2106,24 @@ export class Midy {
             }
         });
     }
-    setPortamentoTime(channelNumber, portamentoTime, scheduleTime) {
-        const channel = this.channels[channelNumber];
+    setPortamentoTime(channelNumber, value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
-        channel.state.portamentoTime = portamentoTime / 127;
+        const channel = this.channels[channelNumber];
+        const state = channel.state;
+        const intPart = Math.trunc(value);
+        state.portamentoTimeMSB = intPart / 127;
+        state.portamentoTimeLSB = value - 127;
         if (channel.isDrum)
             return;
         this.updatePortamento(channel, scheduleTime);
     }
-    setVolume(channelNumber, volume, scheduleTime) {
+    setVolume(channelNumber, value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.volume = volume / 127;
+        const state = channel.state;
+        const intPart = Math.trunc(value);
+        state.volumeMSB = intPart / 127;
+        state.volumeLSB = value - intPart;
         if (channel.isDrum) {
             for (let i = 0; i < 128; i++) {
                 this.updateKeyBasedVolume(channel, i, scheduleTime);
@@ -2084,16 +2134,19 @@ export class Midy {
         }
     }
     panToGain(pan) {
-        const theta = Math.PI / 2 * Math.max(0, pan * 127 - 1) / 126;
+        const theta = Math.PI / 2 * Math.max(pan * 127 - 1) / 126;
         return {
             gainLeft: Math.cos(theta),
             gainRight: Math.sin(theta),
         };
     }
-    setPan(channelNumber, pan, scheduleTime) {
+    setPan(channelNumber, value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.pan = pan / 127;
+        const state = channel.state;
+        const intPart = Math.trunc(value);
+        state.panMSB = intPart / 127;
+        state.panLSB = value - intPart;
         if (channel.isDrum) {
             for (let i = 0; i < 128; i++) {
                 this.updateKeyBasedVolume(channel, i, scheduleTime);
@@ -2103,10 +2156,13 @@ export class Midy {
             this.updateChannelVolume(channel, scheduleTime);
         }
     }
-    setExpression(channelNumber, expression, scheduleTime) {
+    setExpression(channelNumber, value, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
-        channel.state.expression = expression / 127;
+        const state = channel.state;
+        const intPart = Math.trunc(value);
+        state.expressionMSB = intPart / 127;
+        state.expressionLSB = value - intPart;
         this.updateChannelVolume(channel, scheduleTime);
     }
     setBankLSB(channelNumber, lsb) {
@@ -2117,37 +2173,42 @@ export class Midy {
         this.handleRPN(channelNumber, 0, scheduleTime);
     }
     updateChannelVolume(channel, scheduleTime) {
-        const state = channel.state;
-        const volume = state.volume * state.expression;
-        const { gainLeft, gainRight } = this.panToGain(state.pan);
+        const { expressionMSB, expressionLSB, volumeMSB, volumeLSB, panMSB, panLSB, } = channel.state;
+        const volume = volumeMSB + volumeLSB / 128;
+        const expression = expressionMSB + expressionLSB / 128;
+        const pan = panMSB + panLSB / 128;
+        const gain = volume * expression;
+        const { gainLeft, gainRight } = this.panToGain(pan);
         channel.gainL.gain
             .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(volume * gainLeft, scheduleTime);
+            .setValueAtTime(gain * gainLeft, scheduleTime);
         channel.gainR.gain
             .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(volume * gainRight, scheduleTime);
+            .setValueAtTime(gain * gainRight, scheduleTime);
     }
     updateKeyBasedVolume(channel, keyNumber, scheduleTime) {
         const gainL = channel.keyBasedGainLs[keyNumber];
         if (!gainL)
             return;
         const gainR = channel.keyBasedGainRs[keyNumber];
-        const state = channel.state;
-        const defaultVolume = state.volume * state.expression;
-        const defaultPan = state.pan;
+        const { expressionMSB, expressionLSB, volumeMSB, volumeLSB, panMSB, panLSB, } = channel.state;
+        const volume = volumeMSB + volumeLSB / 128;
+        const expression = expressionMSB + expressionLSB / 128;
+        const defaultGain = volume * expression;
+        const defaultPan = panMSB + panLSB / 128;
         const keyBasedVolume = this.getKeyBasedValue(channel, keyNumber, 7);
-        const volume = (0 <= keyBasedVolume)
-            ? defaultVolume * keyBasedVolume / 64
-            : defaultVolume;
+        const gain = (0 <= keyBasedVolume)
+            ? defaultGain * keyBasedVolume / 64
+            : defaultGain;
         const keyBasedPan = this.getKeyBasedValue(channel, keyNumber, 10);
         const pan = (0 <= keyBasedPan) ? keyBasedPan / 127 : defaultPan;
         const { gainLeft, gainRight } = this.panToGain(pan);
         gainL.gain
             .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(volume * gainLeft, scheduleTime);
+            .setValueAtTime(gain * gainLeft, scheduleTime);
         gainR.gain
             .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(volume * gainRight, scheduleTime);
+            .setValueAtTime(gain * gainRight, scheduleTime);
     }
     setSustainPedal(channelNumber, value, scheduleTime) {
         const channel = this.channels[channelNumber];
@@ -2220,8 +2281,8 @@ export class Midy {
         scheduleTime ??= this.audioContext.currentTime;
         const state = channel.state;
         state.filterResonance = ccValue / 127;
-        const filterResonance = this.getRelativeKeyBasedValue(channel, note, 71);
         this.processScheduledNotes(channel, (note) => {
+            const filterResonance = this.getRelativeKeyBasedValue(channel, note, 71);
             const Q = note.voiceParams.initialFilterQ / 5 * filterResonance;
             note.filterNode.Q.setValueAtTime(Q, scheduleTime);
         });
@@ -2321,6 +2382,12 @@ export class Midy {
             });
         }
     }
+    setPortamentoNoteNumber(channelNumber, value, scheduleTime) {
+        scheduleTime ??= this.audioContext.currentTime;
+        const channel = this.channels[channelNumber];
+        channel.portamentoControl = true;
+        channel.state.portamentoNoteNumber = value / 127;
+    }
     setReverbSendLevel(channelNumber, reverbSendLevel, scheduleTime) {
         scheduleTime ??= this.audioContext.currentTime;
         const channel = this.channels[channelNumber];
@@ -2508,8 +2575,10 @@ export class Midy {
             "polyphonicKeyPressure",
             "channelPressure",
             "pitchWheel",
-            "expression",
-            "modulationDepth",
+            "expressionMSB",
+            "expressionLSB",
+            "modulationDepthMSB",
+            "modulationDepthLSB",
             "sustainPedal",
             "portamento",
             "sostenutoPedal",
@@ -3218,5 +3287,6 @@ Object.defineProperty(Midy, "channelSettings", {
         modulationDepthRange: 50, // cent
         fineTuning: 0, // cent
         coarseTuning: 0, // cent
+        portamentoControl: false,
     }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "A MIDI player/synthesizer written in JavaScript that supports GM-Lite/GM1 and SF2/SF3.",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "test": "node test_runner.js"
   },
   "dependencies": {
-    "@marmooo/soundfont-parser": "^0.1.4",
+    "@marmooo/soundfont-parser": "^0.1.5",
     "midi-file": "^1.2.4"
   },
   "devDependencies": {

package/script/midy-GM1.d.ts

@@ -112,13 +112,13 @@ export class MidyGM1 {
     noteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     disconnectNote(note: any): void;
     releaseNote(channel: any, note: any, endTime: any): Promise<any>;
-    noteOff(channelNumber: any, noteNumber: any, velocity: any, endTime: any, force: any): void;
+    noteOff(channelNumber: any, noteNumber: any, velocity: any, endTime: any, force: any): Promise<any> | undefined;
     setNoteIndex(channel: any, index: any): void;
     findNoteOffIndex(channel: any, noteNumber: any): any;
-    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): void[];
+    releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): (Promise<any> | undefined)[];
     createMessageHandlers(): any[];
     handleMessage(data: any, scheduleTime: any): void;
-    handleChannelMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<void>;
+    handleChannelMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<any>;
     setProgramChange(channelNumber: any, programNumber: any, _scheduleTime: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any, scheduleTime: any): void;
     setPitchBend(channelNumber: any, value: any, scheduleTime: any): void;