@marmooo/midy 0.1.7 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.1.7",
+  "version": "0.2.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.0.7",
+    "@marmooo/soundfont-parser": "^0.1.1",
     "midi-file": "^1.2.4"
   },
   "devDependencies": {

package/script/midy-GM1.d.ts

@@ -1,24 +1,17 @@
 export class MidyGM1 {
     static channelSettings: {
-        volume: number;
-        pan: number;
+        currentBufferSource: null;
+        detune: number;
+        program: number;
         bank: number;
         dataMSB: number;
         dataLSB: number;
-        program: number;
-        pitchBend: number;
+        rpnMSB: number;
+        rpnLSB: number;
         fineTuning: number;
         coarseTuning: number;
         modulationDepthRange: number;
     };
-    static effectSettings: {
-        expression: number;
-        modulationDepth: number;
-        sustainPedal: boolean;
-        rpnMSB: number;
-        rpnLSB: number;
-        pitchBendRange: number;
-    };
     constructor(audioContext: any);
     ticksPerBeat: number;
     totalTime: number;
@@ -40,6 +33,18 @@ export class MidyGM1 {
     exclusiveClassMap: Map<any, any>;
     audioContext: any;
     masterGain: any;
+    voiceParamsHandlers: {
+        modLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
+        vibLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
+        modLfoToFilterFc: (channel: any, note: any, _prevValue: any) => void;
+        modLfoToVolume: (channel: any, note: any) => void;
+        chorusEffectsSend: (_channel: any, _note: any, _prevValue: any) => void;
+        reverbEffectsSend: (_channel: any, _note: any, _prevValue: any) => void;
+        delayModLFO: (_channel: any, note: any, _prevValue: any) => void;
+        freqModLFO: (_channel: any, note: any, _prevValue: any) => void;
+        delayVibLFO: (channel: any, note: any, prevValue: any) => void;
+        freqVibLFO: (channel: any, note: any, _prevValue: any) => void;
+    };
     controlChangeHandlers: {
         1: (channelNumber: any, modulation: any) => void;
         6: (channelNumber: any, value: any) => void;
@@ -65,8 +70,8 @@ export class MidyGM1 {
         merger: any;
     };
     createChannels(audioContext: any): any[];
-    createNoteBuffer(instrumentKey: any, isSF3: any): Promise<any>;
-    createNoteBufferNode(instrumentKey: any, isSF3: any): Promise<any>;
+    createNoteBuffer(voiceParams: any, isSF3: any): Promise<any>;
+    createNoteBufferNode(voiceParams: any, isSF3: any): Promise<any>;
     scheduleTimelineEvents(t: any, offset: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
     playNotes(): Promise<any>;
@@ -88,15 +93,17 @@ export class MidyGM1 {
     getActiveNotes(channel: any, time: any): Map<any, any>;
     getActiveNote(noteList: any, time: any): any;
     cbToRatio(cb: any): number;
+    rateToCent(rate: any): number;
+    centToRate(cent: any): number;
     centToHz(cent: any): number;
-    calcSemitoneOffset(channel: any): any;
-    calcPlaybackRate(instrumentKey: any, noteNumber: any, semitoneOffset: any): number;
+    calcChannelDetune(channel: any): any;
+    updateDetune(channel: any): void;
     setVolumeEnvelope(note: any): void;
-    setPitch(note: any, semitoneOffset: any): void;
+    setPitchEnvelope(note: any): void;
     clampCutoffFrequency(frequency: any): number;
     setFilterEnvelope(note: any): void;
     startModulation(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, voice: any, noteNumber: any, velocity: any, startTime: any, isSF3: any): Promise<Note>;
     scheduleNoteOn(channelNumber: any, noteNumber: any, velocity: any, startTime: any): Promise<void>;
     noteOn(channelNumber: any, noteNumber: any, velocity: any): Promise<void>;
     stopNote(endTime: any, stopTime: any, scheduledNotes: any, index: any): Promise<any>;
@@ -106,7 +113,27 @@ export class MidyGM1 {
     handleMIDIMessage(statusByte: any, data1: any, data2: any): void | Promise<any>;
     handleProgramChange(channelNumber: any, program: any): void;
     handlePitchBendMessage(channelNumber: any, lsb: any, msb: any): void;
-    setPitchBend(channelNumber: any, pitchBend: any): void;
+    setPitchBend(channelNumber: any, value: any): void;
+    setModLfoToPitch(channel: any, note: any): void;
+    setVibLfoToPitch(channel: any, note: any): void;
+    setModLfoToFilterFc(note: any): void;
+    setModLfoToVolume(note: any): void;
+    setDelayModLFO(note: any): void;
+    setFreqModLFO(note: any): void;
+    createVoiceParamsHandlers(): {
+        modLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
+        vibLfoToPitch: (channel: any, note: any, _prevValue: any) => void;
+        modLfoToFilterFc: (channel: any, note: any, _prevValue: any) => void;
+        modLfoToVolume: (channel: any, note: any) => void;
+        chorusEffectsSend: (_channel: any, _note: any, _prevValue: any) => void;
+        reverbEffectsSend: (_channel: any, _note: any, _prevValue: any) => void;
+        delayModLFO: (_channel: any, note: any, _prevValue: any) => void;
+        freqModLFO: (_channel: any, note: any, _prevValue: any) => void;
+        delayVibLFO: (channel: any, note: any, prevValue: any) => void;
+        freqVibLFO: (channel: any, note: any, _prevValue: any) => void;
+    };
+    getControllerState(channel: any, noteNumber: any, velocity: any): Float32Array;
+    applyVoiceParams(channel: any, controllerType: any): void;
     createControlChangeHandlers(): {
         1: (channelNumber: any, modulation: any) => void;
         6: (channelNumber: any, value: any) => void;
@@ -121,7 +148,7 @@ export class MidyGM1 {
         121: (channelNumber: any) => void;
         123: (channelNumber: any) => Promise<void>;
     };
-    handleControlChange(channelNumber: any, controller: any, value: any): void;
+    handleControlChange(channelNumber: any, controllerType: any, value: any): void;
     updateModulation(channel: any): void;
     setModulationDepth(channelNumber: any, modulation: any): void;
     setVolume(channelNumber: any, volume: any): void;
@@ -140,13 +167,12 @@ export class MidyGM1 {
     setRPNMSB(channelNumber: any, value: any): void;
     setRPNLSB(channelNumber: any, value: any): void;
     dataEntryMSB(channelNumber: any, value: any): void;
-    updateDetune(channel: any, detuneChange: any): void;
     handlePitchBendRangeRPN(channelNumber: any): void;
-    setPitchBendRange(channelNumber: any, pitchBendRange: any): void;
+    setPitchBendRange(channelNumber: any, value: any): void;
     handleFineTuningRPN(channelNumber: any): void;
-    setFineTuning(channelNumber: any, fineTuning: any): void;
+    setFineTuning(channelNumber: any, value: any): void;
     handleCoarseTuningRPN(channelNumber: any): void;
-    setCoarseTuning(channelNumber: any, coarseTuning: any): void;
+    setCoarseTuning(channelNumber: any, value: any): void;
     allSoundOff(channelNumber: any): Promise<void>;
     resetAllControllers(channelNumber: any): void;
     allNotesOff(channelNumber: any): Promise<void>;
@@ -160,7 +186,7 @@ export class MidyGM1 {
     scheduleTask(callback: any, startTime: any): Promise<any>;
 }
 declare class Note {
-    constructor(noteNumber: any, velocity: any, startTime: any, instrumentKey: any);
+    constructor(noteNumber: any, velocity: any, startTime: any, voice: any, voiceParams: any);
     bufferSource: any;
     filterNode: any;
     volumeNode: any;
@@ -172,7 +198,8 @@ declare class Note {
     noteNumber: any;
     velocity: any;
     startTime: any;
-    instrumentKey: any;
+    voice: any;
+    voiceParams: any;
 }
 export {};
 //# sourceMappingURL=midy-GM1.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAqBA;IAoBE;;;;;;;;;;;MAWE;IAEF;;;;;;;MAOE;IAEF,+BAOC;IAhDD,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;IAClB,iCAA8B;IAyB5B,kBAAgC;IAChC,gBAA4C;IAC5C;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,+DA2BC;IAED,mEAWC;IAED,2EA+CC;IAED,mCAOC;IAED,0BAkDC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,+EAmBC;IAED,qDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,2BAEC;IAED,4BAEC;IAED,sCAGC;IAED,mFAGC;IAED,mCAeC;IAED,+CAwBC;IAED,6CAIC;IAED,mCAsBC;IAED,+DA0BC;IAED,wHAgCC;IAED,kGAgDC;IAED,0EAGC;IAED,qFA4BC;IAED,6HAuBC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,uDAOC;IAED;;;;;;;;;;;;;MAeC;IAED,2EASC;IAED,qCAkBC;IAED,8DAIC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,wCAUC;IAED,sDAMC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,oDAaC;IAED,kDAKC;IAED,iEAOC;IAED,8CAKC;IAED,yDAMC;IAED,gDAKC;IAED,6DAMC;IAED,+CAEC;IAED,8CAEC;IAED,+CAEC;IAED,4DAgBC;IAED,oBASC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AA9kCD;IAUE,gFAKC;IAdD,kBAAa;IACb,gBAAW;IACX,gBAAW;IACX,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAChB,gBAAW;IACX,kBAAa;IAGX,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,mBAAkC;CAErC"}
+{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AAqFA;IAoBE;;;;;;;;;;;;MAYE;IAEF,+BAQC;IAzCD,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;IAClB,iCAA8B;IAiB5B,kBAAgC;IAChC,gBAA4C;IAC5C;;;;;;;;;;;MAA2D;IAC3D;;;;;;;;;;;;;MAA+D;IAC/D,gBAAiD;IAKnD,4BAMC;IAED,mCAWC;IAED,gDAMC;IAED,sCASC;IAED;;;;MAeC;IAED,yCAUC;IAED,6DA2BC;IAED,iEAUC;IAED,2EA+CC;IAED,mCAOC;IAED,0BAkDC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,+EAmBC;IAED,qDAKC;IAED,uBAKC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,uDASC;IAED,6CAQC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,iCAWC;IAED,mCAgBC;IAED,kCAqBC;IAED,6CAIC;IAED,mCAuBC;IAED,+DAoBC;IAED,gHA2BC;IAED,kGAgDC;IAED,0EAGC;IAED,qFA4BC;IAED,6HAuBC;IAED,0FAGC;IAED,kEAeC;IAED,gFAiBC;IAED,4DAGC;IAED,qEAGC;IAED,mDASC;IAED,gDASC;IAED,gDASC;IAED,qCAMC;IAED,mCAQC;IAED,gCAOC;IAED,+BAMC;IAED;;;;;;;;;;;MA2CC;IAED,+EAMC;IAED,0DA6CC;IAED;;;;;;;;;;;;;MAeC;IAED,+EASC;IAED,qCAiBC;IAED,8DAKC;IACD,iDAIC;IAED;;;MAMC;IAED,2CAIC;IAED,yDAIC;IAED,mDAGC;IAED,wCAWC;IAED,sDAKC;IAED,kFAeC;IAED,2DAMC;IAED,oCAkBC;IAED,gDAEC;IAED,gDAEC;IAED,mDAGC;IAED,kDAKC;IAED,wDASC;IAED,8CAKC;IAED,oDAOC;IAED,gDAKC;IAED,sDAOC;IAED,+CAEC;IAED,8CAqBC;IAED,+CAEC;IAED,4DAgBC;IAED,oBAMC;IAED,yDAaC;IAED,yCAGC;IAED,mCAQC;IAED,wCAEC;IAED,6BASC;IAED,0DAUC;CACF;AAjzCD;IAUE,0FAMC;IAfD,kBAAa;IACb,gBAAW;IACX,gBAAW;IACX,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAChB,gBAAW;IACX,kBAAa;IAGX,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}