@marmooo/midy 0.3.6 → 0.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marmooo/midy",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "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.3",
+    "@marmooo/soundfont-parser": "^0.1.4",
     "midi-file": "^1.2.4"
   },
   "devDependencies": {

package/script/midy-GM1.d.ts

@@ -1,8 +1,8 @@
 export class MidyGM1 {
     static channelSettings: {
+        scheduleIndex: number;
         detune: number;
         programNumber: number;
-        bank: number;
         dataMSB: number;
         dataLSB: number;
         rpnMSB: number;
@@ -22,7 +22,7 @@ export class MidyGM1 {
     startTime: number;
     resumeTime: number;
     soundFonts: any[];
-    soundFontTable: any[];
+    soundFontTable: never[][];
     voiceCounter: Map<any, any>;
     voiceCache: Map<any, any>;
     isPlaying: boolean;
@@ -30,6 +30,7 @@ export class MidyGM1 {
     isPaused: boolean;
     isStopping: boolean;
     isSeeking: boolean;
+    playPromise: any;
     timeline: any[];
     notePromises: any[];
     instruments: Set<any>;
@@ -38,21 +39,21 @@ export class MidyGM1 {
     masterVolume: any;
     scheduler: any;
     schedulerBuffer: any;
+    messageHandlers: any[];
     voiceParamsHandlers: {
-        modLfoToPitch: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        vibLfoToPitch: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        modLfoToFilterFc: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        modLfoToVolume: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        chorusEffectsSend: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        reverbEffectsSend: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        delayModLFO: (_channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        freqModLFO: (_channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        delayVibLFO: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        freqVibLFO: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
+        modLfoToPitch: (channel: any, note: any, scheduleTime: any) => void;
+        vibLfoToPitch: (_channel: any, _note: any, _scheduleTime: any) => void;
+        modLfoToFilterFc: (channel: any, note: any, scheduleTime: any) => void;
+        modLfoToVolume: (channel: any, note: any, scheduleTime: any) => void;
+        chorusEffectsSend: (_channel: any, _note: any, _scheduleTime: any) => void;
+        reverbEffectsSend: (_channel: any, _note: any, _scheduleTime: any) => void;
+        delayModLFO: (_channel: any, note: any, scheduleTime: any) => void;
+        freqModLFO: (_channel: any, note: any, scheduleTime: any) => void;
+        delayVibLFO: (_channel: any, _note: any, _scheduleTime: any) => void;
+        freqVibLFO: (_channel: any, _note: any, _scheduleTime: any) => void;
     };
     controlChangeHandlers: any[];
     channels: any[];
-    initSoundFontTable(): any[];
     addSoundFont(soundFont: any): void;
     toUint8Array(input: any): Promise<Uint8Array<ArrayBuffer>>;
     loadSoundFont(input: any): Promise<void>;
@@ -67,11 +68,14 @@ export class MidyGM1 {
     createChannels(audioContext: any): any[];
     createAudioBuffer(voiceParams: any): Promise<any>;
     createBufferSource(voiceParams: any, audioBuffer: any): any;
-    scheduleTimelineEvents(t: any, resumeTime: any, queueIndex: any): Promise<any>;
+    scheduleTimelineEvents(scheduleTime: any, queueIndex: any): Promise<any>;
     getQueueIndex(second: any): number;
-    playNotes(): Promise<any>;
+    resetAllStates(): void;
+    updateStates(queueIndex: any, nextQueueIndex: any): void;
+    playNotes(): Promise<void>;
     ticksToSecond(ticks: any, secondsPerBeat: any): number;
     secondToTicks(second: any, secondsPerBeat: any): number;
+    getSoundFontId(channel: any): string;
     extractMidiData(midi: any): {
         instruments: Set<any>;
         timeline: any[];
@@ -80,8 +84,8 @@ export class MidyGM1 {
     stopChannelNotes(channelNumber: any, velocity: any, force: any, scheduleTime: any): Promise<any[]>;
     stopNotes(velocity: any, force: any, scheduleTime: any): Promise<any[]>;
     start(): Promise<void>;
-    stop(): void;
-    pause(): void;
+    stop(): Promise<void>;
+    pause(): Promise<void>;
     resume(): Promise<void>;
     seekTo(second: any): void;
     calcTotalTime(): number;
@@ -112,7 +116,9 @@ export class MidyGM1 {
     findNoteOffIndex(channel: any, noteNumber: any): any;
     noteOff(channelNumber: any, noteNumber: any, velocity: any, scheduleTime: any): void;
     releaseSustainPedal(channelNumber: any, halfVelocity: any, scheduleTime: any): void[];
-    handleMIDIMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<void>;
+    createMessageHandlers(): any[];
+    handleMessage(data: any, scheduleTime: any): void;
+    handleChannelMessage(statusByte: any, data1: any, data2: any, scheduleTime: any): void | Promise<void>;
     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;
@@ -122,16 +128,16 @@ export class MidyGM1 {
     setDelayModLFO(note: any, scheduleTime: any): void;
     setFreqModLFO(note: any, scheduleTime: any): void;
     createVoiceParamsHandlers(): {
-        modLfoToPitch: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        vibLfoToPitch: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        modLfoToFilterFc: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        modLfoToVolume: (channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        chorusEffectsSend: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        reverbEffectsSend: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        delayModLFO: (_channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        freqModLFO: (_channel: any, note: any, _prevValue: any, scheduleTime: any) => void;
-        delayVibLFO: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
-        freqVibLFO: (_channel: any, _note: any, _prevValue: any, _scheduleTime: any) => void;
+        modLfoToPitch: (channel: any, note: any, scheduleTime: any) => void;
+        vibLfoToPitch: (_channel: any, _note: any, _scheduleTime: any) => void;
+        modLfoToFilterFc: (channel: any, note: any, scheduleTime: any) => void;
+        modLfoToVolume: (channel: any, note: any, scheduleTime: any) => void;
+        chorusEffectsSend: (_channel: any, _note: any, _scheduleTime: any) => void;
+        reverbEffectsSend: (_channel: any, _note: any, _scheduleTime: any) => void;
+        delayModLFO: (_channel: any, note: any, scheduleTime: any) => void;
+        freqModLFO: (_channel: any, note: any, scheduleTime: any) => void;
+        delayVibLFO: (_channel: any, _note: any, _scheduleTime: any) => void;
+        freqVibLFO: (_channel: any, _note: any, _scheduleTime: any) => void;
     };
     getControllerState(channel: any, noteNumber: any, velocity: any): Float32Array<any>;
     applyVoiceParams(channel: any, controllerType: any, scheduleTime: any): void;
@@ -162,14 +168,14 @@ export class MidyGM1 {
     handleCoarseTuningRPN(channelNumber: any, scheduleTime: any): void;
     setCoarseTuning(channelNumber: any, value: any, scheduleTime: any): void;
     allSoundOff(channelNumber: any, _value: any, scheduleTime: any): Promise<any[]>;
-    resetAllStates(channelNumber: any): void;
+    resetChannelStates(channelNumber: any): void;
     resetAllControllers(channelNumber: any, _value: any, scheduleTime: any): void;
     allNotesOff(channelNumber: any, _value: any, scheduleTime: any): Promise<any[]>;
     handleUniversalNonRealTimeExclusiveMessage(data: any, scheduleTime: any): void;
     GM1SystemOn(scheduleTime: any): void;
     handleUniversalRealTimeExclusiveMessage(data: any, scheduleTime: any): void;
     handleMasterVolumeSysEx(data: any, scheduleTime: any): void;
-    setMasterVolume(volume: any, scheduleTime: any): void;
+    setMasterVolume(value: any, scheduleTime: any): void;
     handleSysEx(data: any, scheduleTime: any): void;
     scheduleTask(callback: any, scheduleTime: any): Promise<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":"AA4FA;IAwBE;;;;;;;;;;;MAWE;IAEF,+BAcC;IAlDD,aAAa;IACb,oBAAiB;IACjB,qBAAmB;IACnB,kBAAc;IACd,0BAAwB;IACxB,kBAAc;IACd,mBAAiB;IACjB,kBAAc;IACd,mBAAe;IACf,kBAAgB;IAChB,sBAA2C;IAC3C,4BAAyB;IACzB,0BAAuB;IACvB,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,gBAAc;IACd,oBAAkB;IAClB,sBAAwB;IACxB,2BAAqC;IAgBnC,kBAAgC;IAChC,kBAA8C;IAC9C,eAAwD;IACxD,qBAGE;IACF;;;;;;;;;;;MAA2D;IAC3D,6BAA+D;IAC/D,gBAAiD;IAMnD,4BAMC;IAED,mCASC;IAED,2DAYC;IAED,yCAmBC;IAED,oCASC;IAED,sBAoCC;IAED,8DAcC;IAED;;;;MAeC;IAED,yCAaC;IAED,kDAUC;IAED,4DASC;IAED,+EAkDC;IAED,mCAOC;IAED,0BAgEC;IAED,uDAEC;IAED,wDAEC;IAED;;;MAgEC;IAED,kGAeC;IAED,mGAeC;IAED,wEAMC;IAED,uBAMC;IAED,aAGC;IAED,cAKC;IAED,wBAIC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,yDAQC;IAED,yEASC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,6FAyBC;IAED,oGAuCC;IAED,0EAiBC;IAED,kGAmCC;IAED,6FASC;IAED,gCASC;IAED,iEAoBC;IAED,qGAeC;IAED,6CAUC;IAED,qDAUC;IAED,qFASC;IAED,sFAeC;IAED,oGA2BC;IAED,mFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAWC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MA2BC;IAED,oFAMC;IAED,6EAgCC;IAED,qCAeC;IAED,+FAWC;IAED,wDASC;IAED,iFAKC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,2DAMC;IAED,uDAkBC;IAED,gDAEC;IAED,gDAEC;IAED,sEAGC;IAED,qEAKC;IAED,2EAUC;IAED,iEAKC;IAED,uEAQC;IAED,mEAKC;IAED,yEAQC;IAED,gFAGC;IAED,yCAqBC;IAGD,8EAgCC;IAED,gFAGC;IAED,+EAgBC;IAED,qCAWC;IAED,4EAaC;IAED,4DAGC;IAED,sDASC;IAED,gDAYC;IAGD,6DAgBC;CACF;AAjgDD;IAWE,0FAMC;IAhBD,cAAW;IACX,gBAAe;IACf,kBAAa;IACb,gBAAW;IACX,iBAAY;IACZ,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}
+{"version":3,"file":"midy-GM1.d.ts","sourceRoot":"","sources":["../src/midy-GM1.js"],"names":[],"mappings":"AA4FA;IAyBE;;;;;;;;;;;MAWE;IAEF,+BAeC;IApDD,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,mBAAkB;IAClB,mBAAkB;IAClB,kBAAiB;IACjB,oBAAmB;IACnB,mBAAkB;IAClB,iBAAY;IACZ,gBAAc;IACd,oBAAkB;IAClB,sBAAwB;IACxB,2BAAqC;IAgBnC,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,8DAWC;IAED;;;;MAeC;IAED,yCAaC;IAED,kDAUC;IAED,4DASC;IAED,yEAqDC;IAED,mCAOC;IAED,uBAQC;IAED,yDA2BC;IAED,2BAwCC;IAED,uDAEC;IAED,wDAEC;IAED,qCAKC;IAED;;;MAwDC;IAED,kGAeC;IAED,mGAeC;IAED,wEAMC;IAED,uBAMC;IAED,sBAKC;IAED,uBAQC;IAED,wBAKC;IAED,0BAKC;IAED,wBAOC;IAED,sBAGC;IAED,yDAQC;IAED,yEASC;IAED,2BAEC;IAED,8BAEC;IAED,8BAEC;IAED,4BAEC;IAED,qCAMC;IAED,2DAIC;IAED,+DAIC;IAED,sDAeC;IAED,qDAoBC;IAED,6CAIC;IAED,sDAsBC;IAED,kEAoBC;IAED,6FAyBC;IAED,oGAuCC;IAED,0EAiBC;IAED,kGAgCC;IAED,6FASC;IAED,gCASC;IAED,iEAoBC;IAED,qGAeC;IAED,6CAUC;IAED,qDAUC;IAED,qFASC;IAED,sFAeC;IAED,+BAmBC;IAED,kDAOC;IAED,uGA2BC;IAED,mFAGC;IAED,wFAGC;IAED,sEAUC;IAED,mEAWC;IAED,wDAKC;IAED,sDAOC;IAED,mDAMC;IAED,kDAKC;IAED;;;;;;;;;;;MAiCC;IAED,oFAMC;IAED,6EA2BC;IAED,qCAeC;IAED,+FAWC;IAED,wDASC;IAED,iFAKC;IAED,oEAKC;IAED;;;MAMC;IAED,8DAKC;IAED,4EAKC;IAED,sEAGC;IAED,2DAUC;IAED,yEAWC;IAED,kFAeC;IAED,2DAMC;IAED,uDAkBC;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,qCASC;IAED,4EAaC;IAED,4DAGC;IAED,qDAKC;IAED,gDAYC;IAGD,6DAgBC;CACF;AAtiDD;IAWE,0FAMC;IAhBD,cAAW;IACX,gBAAe;IACf,kBAAa;IACb,gBAAW;IACX,iBAAY;IACZ,wBAAmB;IACnB,iBAAY;IACZ,mBAAc;IACd,qBAAgB;IAGd,gBAA4B;IAC5B,cAAwB;IACxB,eAA0B;IAC1B,WAAkB;IAClB,iBAA8B;CAEjC"}