@marmooo/midy 0.4.6 → 0.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "A MIDI player/synthesizer written in JavaScript that supports GM-Lite/GM1 and SF2/SF3.",
   "repository": {
     "type": "git",
@@ -22,7 +22,8 @@
     "test": "node test_runner.js"
   },
   "dependencies": {
-    "@marmooo/soundfont-parser": "^0.1.7",
+    "@marmooo/soundfont-parser": "^0.1.8",
+    "@wasm-audio-decoders/ogg-vorbis": "^0.1.20",
     "midi-file": "^1.2.4"
   },
   "devDependencies": {

package/script/midy-GM1.d.ts

@@ -27,6 +27,8 @@ export class MidyGM1 extends EventTarget {
     voiceCounter: Map<any, any>;
     voiceCache: Map<any, any>;
     realtimeVoiceCache: Map<any, any>;
+    decodeMethod: string;
+    decoderQueue: Promise<void>;
     isPlaying: boolean;
     isPausing: boolean;
     isPaused: boolean;
@@ -72,6 +74,7 @@ export class MidyGM1 extends EventTarget {
         merger: any;
     };
     createChannels(audioContext: any): any[];
+    decodeOggVorbis(sample: any): Promise<any>;
     createAudioBuffer(voiceParams: any): Promise<any>;
     createBufferSource(voiceParams: any, audioBuffer: any): any;
     scheduleTimelineEvents(scheduleTime: any, queueIndex: any): any;

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAuGA;IAoCE;;;;;;;;;;;MAWE;IAEF,+BAgBC;IA5DD,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,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;IAiBnC,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,sBAoCC;IAED,8DAeC;IAED;;;;MAeC;IAED,yCAaC;IAED,kDASC;IAED,4DASC;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,qCAMC;IAED,2DAIC;IAED,6CAEC;IAED,sDAeC;IAED,4DASC;IAED,qDAkBC;IAED,6CAIC;IAED,sDA6BC;IAED,kEAqBC;IAED,4GAkCC;IAED,uEAyCC;IAED,0EAiBC;IAED,oEASC;IAED,0FAwBC;IAED,gCASC;IAED,iEAwBC;IAED,4FAmBC;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,+FAWC;IAED,wDAUC;IAED,4EAKC;IAED,mEAKC;IAED;;;MAMC;IAED,gEAKC;IAED,uEAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,2DAMC;IAED,uDAoBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAMC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,6CAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAUC;IAED,4EAaC;IAED,4DAGC;IAED,qDAKC;IAED,gDAYC;IAGD,6DAgBC;CACF"}
+{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAmHA;IAsCE;;;;;;;;;;;MAWE;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,4BAAiC;IACjC,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;IAiBnC,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,4DASC;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,qCAMC;IAED,2DAIC;IAED,6CAEC;IAED,sDAeC;IAED,4DASC;IAED,qDAkBC;IAED,6CAIC;IAED,sDA6BC;IAED,kEAqBC;IAED,4GAkCC;IAED,uEAyCC;IAED,0EAiBC;IAED,oEASC;IAED,0FAwBC;IAED,gCASC;IAED,iEAwBC;IAED,4FAmBC;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,2DAMC;IAED,uDAoBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAMC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,6CAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAUC;IAED,4EAaC;IAED,4DAGC;IAED,qDAKC;IAED,gDAYC;IAGD,6DAgBC;CACF"}

package/script/midy-GM1.js

@@ -3,6 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidyGM1 = void 0;
 const midi_file_1 = require("midi-file");
 const soundfont_parser_1 = require("@marmooo/soundfont-parser");
+const ogg_vorbis_1 = require("@wasm-audio-decoders/ogg-vorbis");
+let decoderPromise = null;
+let decoderQueue = Promise.resolve();
+function initDecoder() {
+    if (!decoderPromise) {
+        const instance = new ogg_vorbis_1.OggVorbisDecoderWebWorker();
+        decoderPromise = instance.ready.then(() => instance);
+    }
+    return decoderPromise;
+}
 class Note {
     constructor(noteNumber, velocity, startTime) {
         Object.defineProperty(this, "voice", {
@@ -41,37 +51,37 @@ class Note {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "filterNode", {
+        Object.defineProperty(this, "filterEnvelopeNode", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "filterDepth", {
+        Object.defineProperty(this, "volumeEnvelopeNode", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "volumeEnvelopeNode", {
+        Object.defineProperty(this, "modLfo", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
-        });
-        Object.defineProperty(this, "volumeDepth", {
+        }); // CC#1 modulation LFO
+        Object.defineProperty(this, "modLfoToPitch", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "modulationLFO", {
+        Object.defineProperty(this, "modLfoToFilterFc", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "modulationDepth", {
+        Object.defineProperty(this, "modLfoToVolume", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -258,6 +268,18 @@ class MidyGM1 extends EventTarget {
             writable: true,
             value: new Map()
         });
+        Object.defineProperty(this, "decodeMethod", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "wasm-audio-decoders"
+        });
+        Object.defineProperty(this, "decoderQueue", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: Promise.resolve()
+        });
         Object.defineProperty(this, "isPlaying", {
             enumerable: true,
             configurable: true,
@@ -419,14 +441,6 @@ class MidyGM1 extends EventTarget {
                     voiceCounter.set(audioBufferId, (voiceCounter.get(audioBufferId) ?? 0) + 1);
                     break;
                 }
-                case "controller":
-                    if (event.controllerType === 0) {
-                        this.setBankMSB(event.channel, event.value);
-                    }
-                    else if (event.controllerType === 32) {
-                        this.setBankLSB(event.channel, event.value);
-                    }
-                    break;
                 case "programChange":
                     this.setProgramChange(event.channel, event.programNumber, event.startTime);
             }
@@ -484,11 +498,57 @@ class MidyGM1 extends EventTarget {
         });
         return channels;
     }
+    decodeOggVorbis(sample) {
+        const task = decoderQueue.then(async () => {
+            const decoder = await initDecoder();
+            const slice = sample.data.slice();
+            const { channelData, sampleRate, errors } = await decoder.decodeFile(slice);
+            if (0 < errors.length) {
+                throw new Error(errors.join(", "));
+            }
+            const audioBuffer = new AudioBuffer({
+                numberOfChannels: channelData.length,
+                length: channelData[0].length,
+                sampleRate,
+            });
+            for (let ch = 0; ch < channelData.length; ch++) {
+                audioBuffer.getChannelData(ch).set(channelData[ch]);
+            }
+            return audioBuffer;
+        });
+        decoderQueue = task.catch(() => { });
+        return task;
+    }
     async createAudioBuffer(voiceParams) {
-        const { sample, start, end } = voiceParams;
-        const sampleEnd = sample.data.length + end;
-        const audioBuffer = await sample.toAudioBuffer(this.audioContext, start, sampleEnd);
-        return audioBuffer;
+        const sample = voiceParams.sample;
+        if (sample.type === "compressed") {
+            switch (this.decodeMethod) {
+                case "decodeAudioData": {
+                    // https://jakearchibald.com/2016/sounds-fun/
+                    // https://github.com/WebAudio/web-audio-api/issues/1091
+                    //   decodeAudioData() has priming issues on Safari
+                    const arrayBuffer = sample.data.slice().buffer;
+                    return await this.audioContext.decodeAudioData(arrayBuffer);
+                }
+                case "wasm-audio-decoders":
+                    return await this.decodeOggVorbis(sample);
+                default:
+                    throw new Error(`Unknown decodeMethod: ${this.decodeMethod}`);
+            }
+        }
+        else {
+            const data = sample.data;
+            const end = data.length + voiceParams.end;
+            const subarray = data.subarray(voiceParams.start, end);
+            const pcm = sample.decodePCM(subarray);
+            const audioBuffer = new AudioBuffer({
+                numberOfChannels: 1,
+                length: pcm.length,
+                sampleRate: sample.sampleHeader.sampleRate,
+            });
+            audioBuffer.getChannelData(0).set(pcm);
+            return audioBuffer;
+        }
     }
     createBufferSource(voiceParams, audioBuffer) {
         const bufferSource = new AudioBufferSourceNode(this.audioContext);
@@ -554,7 +614,7 @@ class MidyGM1 extends EventTarget {
         const channels = this.channels;
         for (let ch = 0; ch < channels.length; ch++) {
             channels[ch].scheduledNotes = [];
-            this.resetChannelStates(i);
+            this.resetChannelStates(ch);
         }
     }
     updateStates(queueIndex, nextQueueIndex) {
@@ -937,7 +997,7 @@ class MidyGM1 extends EventTarget {
         const modHold = modAttack + voiceParams.modHold;
         const decayDuration = voiceParams.modDecay;
         note.adjustedBaseFreq = adjustedBaseFreq;
-        note.filterNode.frequency
+        note.filterEnvelopeNode.frequency
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(adjustedBaseFreq, startTime)
             .setValueAtTime(adjustedBaseFreq, modDelay)
@@ -948,23 +1008,23 @@ class MidyGM1 extends EventTarget {
     startModulation(channel, note, scheduleTime) {
         const audioContext = this.audioContext;
         const { voiceParams } = note;
-        note.modulationLFO = new OscillatorNode(audioContext, {
+        note.modLfo = new OscillatorNode(audioContext, {
             frequency: this.centToHz(voiceParams.freqModLFO),
         });
-        note.filterDepth = new GainNode(audioContext, {
+        note.modLfoToFilterFc = new GainNode(audioContext, {
             gain: voiceParams.modLfoToFilterFc,
         });
-        note.modulationDepth = new GainNode(audioContext);
+        note.modLfoToPitch = new GainNode(audioContext);
         this.setModLfoToPitch(channel, note, scheduleTime);
-        note.volumeDepth = new GainNode(audioContext);
+        note.modLfoToVolume = new GainNode(audioContext);
         this.setModLfoToVolume(note, scheduleTime);
-        note.modulationLFO.start(note.startTime + voiceParams.delayModLFO);
-        note.modulationLFO.connect(note.filterDepth);
-        note.filterDepth.connect(note.filterNode.frequency);
-        note.modulationLFO.connect(note.modulationDepth);
-        note.modulationDepth.connect(note.bufferSource.detune);
-        note.modulationLFO.connect(note.volumeDepth);
-        note.volumeDepth.connect(note.volumeEnvelopeNode.gain);
+        note.modLfo.start(note.startTime + voiceParams.delayModLFO);
+        note.modLfo.connect(note.modLfoToFilterFc);
+        note.modLfoToFilterFc.connect(note.filterEnvelopeNode.frequency);
+        note.modLfo.connect(note.modLfoToPitch);
+        note.modLfoToPitch.connect(note.bufferSource.detune);
+        note.modLfo.connect(note.modLfoToVolume);
+        note.modLfoToVolume.connect(note.volumeEnvelopeNode.gain);
     }
     async getAudioBuffer(channel, noteNumber, velocity, voiceParams, realtime) {
         const audioBufferId = this.getVoiceId(channel, noteNumber, velocity);
@@ -1005,7 +1065,7 @@ class MidyGM1 extends EventTarget {
         const audioBuffer = await this.getAudioBuffer(channel, noteNumber, velocity, voiceParams, realtime);
         note.bufferSource = this.createBufferSource(voiceParams, audioBuffer);
         note.volumeEnvelopeNode = new GainNode(audioContext);
-        note.filterNode = new BiquadFilterNode(audioContext, {
+        note.filterEnvelopeNode = new BiquadFilterNode(audioContext, {
             type: "lowpass",
             Q: voiceParams.initialFilterQ / 10, // dB
         });
@@ -1016,8 +1076,8 @@ class MidyGM1 extends EventTarget {
         if (0 < state.modulationDepthMSB) {
             this.startModulation(channel, note, now);
         }
-        note.bufferSource.connect(note.filterNode);
-        note.filterNode.connect(note.volumeEnvelopeNode);
+        note.bufferSource.connect(note.filterEnvelopeNode);
+        note.filterEnvelopeNode.connect(note.volumeEnvelopeNode);
         if (voiceParams.sample.type === "compressed") {
             const offset = voiceParams.start / audioBuffer.sampleRate;
             note.bufferSource.start(startTime, offset);
@@ -1083,19 +1143,19 @@ class MidyGM1 extends EventTarget {
     }
     disconnectNote(note) {
         note.bufferSource.disconnect();
-        note.filterNode.disconnect();
+        note.filterEnvelopeNode.disconnect();
         note.volumeEnvelopeNode.disconnect();
-        if (note.modulationDepth) {
-            note.volumeDepth.disconnect();
-            note.modulationDepth.disconnect();
-            note.modulationLFO.stop();
+        if (note.modLfoToPitch) {
+            note.modLfoToVolume.disconnect();
+            note.modLfoToPitch.disconnect();
+            note.modLfo.stop();
         }
     }
     releaseNote(channel, note, endTime) {
         endTime ??= this.audioContext.currentTime;
         const volDuration = note.voiceParams.volRelease;
         const volRelease = endTime + volDuration;
-        note.filterNode.frequency
+        note.filterEnvelopeNode.frequency
             .cancelScheduledValues(endTime)
             .setTargetAtTime(note.adjustedBaseFreq, endTime, note.voiceParams.modRelease * releaseCurve);
         note.volumeEnvelopeNode.gain
@@ -1223,12 +1283,12 @@ class MidyGM1 extends EventTarget {
         this.applyVoiceParams(channel, 14, scheduleTime);
     }
     setModLfoToPitch(channel, note, scheduleTime) {
-        if (note.modulationDepth) {
+        if (note.modLfoToPitch) {
             const modLfoToPitch = note.voiceParams.modLfoToPitch;
             const baseDepth = Math.abs(modLfoToPitch) +
                 channel.state.modulationDepthMSB;
             const depth = baseDepth * Math.sign(modLfoToPitch);
-            note.modulationDepth.gain
+            note.modLfoToPitch.gain
                 .cancelScheduledValues(scheduleTime)
                 .setValueAtTime(depth, scheduleTime);
         }
@@ -1238,29 +1298,29 @@ class MidyGM1 extends EventTarget {
     }
     setModLfoToFilterFc(note, scheduleTime) {
         const modLfoToFilterFc = note.voiceParams.modLfoToFilterFc;
-        note.filterDepth.gain
+        note.modLfoToFilterFc.gain
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(modLfoToFilterFc, scheduleTime);
     }
     setModLfoToVolume(note, scheduleTime) {
         const modLfoToVolume = note.voiceParams.modLfoToVolume;
         const baseDepth = cbToRatio(Math.abs(modLfoToVolume)) - 1;
-        const volumeDepth = baseDepth * Math.sign(modLfoToVolume);
-        note.volumeDepth.gain
+        const depth = baseDepth * Math.sign(modLfoToVolume);
+        note.modLfoToVolume.gain
             .cancelScheduledValues(scheduleTime)
-            .setValueAtTime(volumeDepth, scheduleTime);
+            .setValueAtTime(depth, scheduleTime);
     }
     setDelayModLFO(note, scheduleTime) {
         const startTime = note.startTime;
         if (startTime < scheduleTime)
             return;
-        note.modulationLFO.stop(scheduleTime);
-        note.modulationLFO.start(startTime + note.voiceParams.delayModLFO);
-        note.modulationLFO.connect(note.filterDepth);
+        note.modLfo.stop(scheduleTime);
+        note.modLfo.start(startTime + note.voiceParams.delayModLFO);
+        note.modLfo.connect(note.modLfoToFilterFc);
     }
     setFreqModLFO(note, scheduleTime) {
         const freqModLFO = note.voiceParams.freqModLFO;
-        note.modulationLFO.frequency
+        note.modLfo.frequency
             .cancelScheduledValues(scheduleTime)
             .setValueAtTime(freqModLFO, scheduleTime);
     }
@@ -1357,6 +1417,8 @@ class MidyGM1 extends EventTarget {
         return handlers;
     }
     setControlChange(channelNumber, controllerType, value, scheduleTime) {
+        if (!(0 <= scheduleTime))
+            scheduleTime = this.audioContext.currentTime;
         const handler = this.controlChangeHandlers[controllerType];
         if (handler) {
             handler.call(this, channelNumber, value, scheduleTime);
@@ -1371,8 +1433,8 @@ class MidyGM1 extends EventTarget {
         const depth = channel.state.modulationDepthMSB *
             channel.modulationDepthRange;
         this.processScheduledNotes(channel, (note) => {
-            if (note.modulationDepth) {
-                note.modulationDepth.gain.setValueAtTime(depth, scheduleTime);
+            if (note.modLfoToPitch) {
+                note.modLfoToPitch.gain.setValueAtTime(depth, scheduleTime);
             }
             else {
                 this.startModulation(channel, note, scheduleTime);

package/script/midy-GM2.d.ts

@@ -46,6 +46,7 @@ export class MidyGM2 extends EventTarget {
     voiceCounter: Map<any, any>;
     voiceCache: Map<any, any>;
     realtimeVoiceCache: Map<any, any>;
+    decodeMethod: string;
     isPlaying: boolean;
     isPausing: boolean;
     isPaused: boolean;
@@ -80,6 +81,7 @@ export class MidyGM2 extends EventTarget {
     };
     controlChangeHandlers: any[];
     keyBasedControllerHandlers: any[];
+    effectHandlers: any[];
     channels: any[];
     reverbEffect: {
         input: any;
@@ -107,6 +109,7 @@ export class MidyGM2 extends EventTarget {
     };
     resetChannelTable(channel: any): void;
     createChannels(audioContext: any): any[];
+    decodeOggVorbis(sample: any): Promise<any>;
     createAudioBuffer(voiceParams: any): Promise<any>;
     isLoopDrum(channel: any, noteNumber: any): boolean;
     createBufferSource(channel: any, noteNumber: any, voiceParams: any, audioBuffer: any): any;
@@ -234,6 +237,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;
@@ -304,15 +308,23 @@ export class MidyGM2 extends EventTarget {
     getChorusSendToReverb(value: any): number;
     getChannelBitmap(data: any): any[];
     handleScaleOctaveTuning1ByteFormatSysEx(data: any, realtime: any, scheduleTime: any): void;
+    calcEffectValue(channel: any, destination: any): number;
+    calcChannelEffectValue(channel: any, destination: any): number;
+    calcControlChangeEffectValue(channel: any, destination: any): number;
+    calcChannelPressureEffectValue(channel: any, destination: any): number;
+    getChannelPitchControl(channel: any): number;
+    getPitchControl(channel: any, note: any): number;
     getFilterCutoffControl(channel: any): number;
-    getAmplitudeControl(channel: any): number;
+    getChannelAmplitudeControl(channel: any): number;
     getLFOPitchDepth(channel: any): number;
     getLFOFilterDepth(channel: any): number;
     getLFOAmplitudeDepth(channel: any): number;
-    setEffects(channel: any, note: any, table: any, scheduleTime: any): void;
+    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;
-    initControlTable(): Int8Array<ArrayBuffer>;
-    setControlChangeEffects(channel: any, controllerType: any, scheduleTime: any): void;
     handleControlChangeSysEx(data: any, scheduleTime: any): void;
     getKeyBasedValue(channel: any, keyNumber: any, controllerType: any): any;
     createKeyBasedControllerHandlers(): any[];

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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"}