spessasynth_core 4.2.0 → 4.2.1

package/dist/index.d.ts

@@ -1053,27 +1053,9 @@ interface InsertionProcessor {
 interface InsertionProcessorSnapshot {
     type: number;
     /**
-     * Parameters for the effect, 255 means "no change"
+     * 20 parameters for the effect, 255 means "no change" + 3 effect sends (index 20, 21, 22)
      */
     params: Uint8Array;
-    /**
-     * 0-127
-     * This parameter sets the amount of insertion sound that will be sent to the reverb.
-     * Higher values result in more sound being sent.
-     */
-    sendLevelToReverb: number;
-    /**
-     * 0-127
-     * This parameter sets the amount of insertion sound that will be sent to the chorus.
-     * Higher values result in more sound being sent.
-     */
-    sendLevelToChorus: number;
-    /**
-     * 0-127
-     * This parameter sets the amount of insertion sound that will be sent to the delay.
-     * Higher values result in more sound being sent.
-     */
-    sendLevelToDelay: number;
     /**
      * A boolean list for channels that have the insertion effect enabled.
      */
@@ -3040,6 +3022,8 @@ declare class SynthesizerCore {
     protected portSelectChannelOffset: number;
     /**
      * For insertion snapshot tracking
+     * 20 parameters (0-19) + 3 sends
+     * Index to gs is Addr3 - 3 (for example EFX PARAMETER 1 is 0x03 and here it's 0)
      * note: 255 means "no change"
      * @protected
      */
@@ -3159,6 +3143,7 @@ declare class SynthesizerCore {
      * Copied callback so MIDI channels can call it.
      */
     callEvent<K extends keyof SynthProcessorEventData>(eventName: K, eventData: SynthProcessorEventData[K]): void;
+    protected resetInsertionParams(): void;
     protected resetInsertion(): void;
     /**
      * @param volume {number} 0 to 1
@@ -4793,9 +4778,9 @@ declare class SpessaSynthSequencer {
     songs: BasicMIDI[];
     /**
      * The shuffled song indexes.
-     * This is used when shuffleMode is enabled.
+     * This is used when shuffle mode is enabled.
      */
-    shuffledSongIndexes: number[];
+    readonly shuffledSongIndexes: number[];
     /**
      * The synthesizer connected to the sequencer.
      */
@@ -4910,23 +4895,25 @@ declare class SpessaSynthSequencer {
     protected _songIndex: number;
     /**
      * The current song index in the song list.
-     * If shuffleMode is enabled, this is the index of the shuffled song list.
+     * If shuffle mode is enabled, this is the index of the shuffled song list.
      */
     get songIndex(): number;
     /**
      * The current song index in the song list.
-     * If shuffleMode is enabled, this is the index of the shuffled song list.
+     * If shuffle mode is enabled, this is the index of the shuffled song list.
      */
     set songIndex(value: number);
     protected _shuffleMode: boolean;
     /**
      * Controls if the sequencer should shuffle the songs in the song list.
      * If true, the sequencer will play the songs in a random order.
+     * Songs are shuffled on a `loadNewSongList` call.
      */
     get shuffleMode(): boolean;
     /**
      * Controls if the sequencer should shuffle the songs in the song list.
      * If true, the sequencer will play the songs in a random order.
+     * Songs are shuffled on a `loadNewSongList` call.
      */
     set shuffleMode(on: boolean);
     /**
@@ -5012,7 +4999,6 @@ declare class SpessaSynthSequencer {
     protected sendMIDINoteOn(channel: number, midiNote: number, velocity: number): void;
     protected sendMIDINoteOff(channel: number, midiNote: number): void;
     protected sendMIDICC(channel: number, type: MIDIController, value: number): void;
-    protected sendMIDIProgramChange(channel: number, program: number): void;
     /**
      * Sets the pitch of the given channel
      * @param channel usually 0-15: the channel to change pitch

package/dist/index.js

@@ -1022,6 +1022,7 @@ var MIN_NOTE_LENGTH = 0.03;
 var MIN_EXCLUSIVE_LENGTH = 0.07;
 var SYNTHESIZER_GAIN = 1;
 var SPESSA_BUFSIZE = 128;
+var EFX_SENDS_GAIN_CORRECTION = 1 / Math.cos(Math.PI / 4) ** 2;
 
 // src/utils/midi_hacks.ts
 var XG_SFX_VOICE = 64;
@@ -2316,10 +2317,7 @@ function modifyMIDIInternal(midi, {
       sendAddress(targetTicks, 64, 3, 0, [
         p.type >> 8,
         p.type & 127
-      ]),
-      sendAddress(targetTicks, 64, 3, 23, [p.sendLevelToReverb]),
-      sendAddress(targetTicks, 64, 3, 24, [p.sendLevelToChorus]),
-      sendAddress(targetTicks, 64, 3, 25, [p.sendLevelToDelay])
+      ])
     );
   }
   if (!addedGs && programChanges.length > 0) {
@@ -5066,7 +5064,7 @@ var SpessaSynthSequencer = class {
   songs = [];
   /**
    * The shuffled song indexes.
-   * This is used when shuffleMode is enabled.
+   * This is used when shuffle mode is enabled.
    */
   shuffledSongIndexes = [];
   /**
@@ -5191,7 +5189,7 @@ var SpessaSynthSequencer = class {
   // noinspection JSUnusedGlobalSymbols
   /**
    * The current song index in the song list.
-   * If shuffleMode is enabled, this is the index of the shuffled song list.
+   * If shuffle mode is enabled, this is the index of the shuffled song list.
    */
   get songIndex() {
     return this._songIndex;
@@ -5199,7 +5197,7 @@ var SpessaSynthSequencer = class {
   // noinspection JSUnusedGlobalSymbols
   /**
    * The current song index in the song list.
-   * If shuffleMode is enabled, this is the index of the shuffled song list.
+   * If shuffle mode is enabled, this is the index of the shuffled song list.
    */
   set songIndex(value) {
     this._songIndex = value;
@@ -5211,6 +5209,7 @@ var SpessaSynthSequencer = class {
   /**
    * Controls if the sequencer should shuffle the songs in the song list.
    * If true, the sequencer will play the songs in a random order.
+   * Songs are shuffled on a `loadNewSongList` call.
    */
   get shuffleMode() {
     return this._shuffleMode;
@@ -5219,16 +5218,10 @@ var SpessaSynthSequencer = class {
   /**
    * Controls if the sequencer should shuffle the songs in the song list.
    * If true, the sequencer will play the songs in a random order.
+   * Songs are shuffled on a `loadNewSongList` call.
    */
   set shuffleMode(on) {
     this._shuffleMode = on;
-    if (on) {
-      this.shuffleSongIndexes();
-      this._songIndex = 0;
-      this.loadCurrentSong();
-    } else {
-      this._songIndex = this.shuffledSongIndexes[this._songIndex];
-    }
   }
   /**
    * Internal playback rate.
@@ -5457,7 +5450,7 @@ var SpessaSynthSequencer = class {
   }
   shuffleSongIndexes() {
     const indexes = this.songs.map((_, i) => i);
-    this.shuffledSongIndexes = [];
+    this.shuffledSongIndexes.length = 0;
     while (indexes.length > 0) {
       const index = indexes[Math.floor(Math.random() * indexes.length)];
       this.shuffledSongIndexes.push(index);
@@ -5553,17 +5546,6 @@ var SpessaSynthSequencer = class {
       value
     ]);
   }
-  sendMIDIProgramChange(channel, program) {
-    if (!this.externalMIDIPlayback) {
-      this.synth.programChange(channel, program);
-      return;
-    }
-    channel %= 16;
-    this.sendMIDIMessage([
-      midiMessageTypes.programChange | channel,
-      program
-    ]);
-  }
   /**
    * Sets the pitch of the given channel
    * @param channel usually 0-15: the channel to change pitch
@@ -6511,6 +6493,7 @@ var DelayLine = class {
 };
 
 // src/synthesizer/audio_engine/effects/reverb/reverb.ts
+var DELAY_GAIN = 1.5;
 var SpessaSynthReverb = class {
   /**
    * Dattorro reverb processor.
@@ -6841,7 +6824,7 @@ var SpessaSynthReverb = class {
   }
   updateGain() {
     this.dattorro.gain = this._level / 348 * this.characterGainCoefficient;
-    this.delayGain = this._level / 127;
+    this.delayGain = this._level / 127 * DELAY_GAIN;
   }
   updateTime() {
     const t = this._time / 127;
@@ -6858,6 +6841,7 @@ var SpessaSynthReverb = class {
 };
 
 // src/synthesizer/audio_engine/effects/chorus/chorus.ts
+var CHORUS_GAIN = 1.3;
 var SpessaSynthChorus = class {
   /**
    * Cutoff frequency
@@ -6879,7 +6863,7 @@ var SpessaSynthChorus = class {
   sampleRate;
   phase = 0;
   write = 0;
-  gain = 1;
+  gain = 0.5;
   reverbGain = 0;
   delayGain = 0;
   depthSamples = 0;
@@ -6962,7 +6946,7 @@ var SpessaSynthChorus = class {
     return this._level;
   }
   set level(value) {
-    this.gain = value / 127;
+    this.gain = value / 127 * CHORUS_GAIN;
     this._level = value;
   }
   process(input, outputLeft, outputRight, outputReverb, outputDelay, startIndex, sampleCount) {
@@ -7035,7 +7019,6 @@ var SpessaSynthChorus = class {
     };
   }
 };
-var chorus_default = SpessaSynthChorus;
 
 // src/synthesizer/audio_engine/effects/delay/delay.ts
 var delayTimeSegments = [
@@ -7049,6 +7032,7 @@ var delayTimeSegments = [
   { start: 90, end: 105, timeStart: 200, resolution: 20 },
   { start: 105, end: 116, timeStart: 500, resolution: 50 }
 ];
+var DELAY_GAIN2 = 1.66;
 var SpessaSynthDelay = class {
   /**
    * Cutoff frequency
@@ -7117,7 +7101,7 @@ var SpessaSynthDelay = class {
   }
   set level(value) {
     this._level = value;
-    this.gain = value / 127;
+    this.gain = value / 127 * DELAY_GAIN2;
   }
   _levelCenter = 127;
   get levelCenter() {
@@ -7253,7 +7237,7 @@ function getDefaultSynthOptions(sampleRate) {
   return {
     ...DEFAULT_SYNTH_OPTIONS,
     reverbProcessor: new SpessaSynthReverb(sampleRate),
-    chorusProcessor: new chorus_default(sampleRate),
+    chorusProcessor: new SpessaSynthChorus(sampleRate),
     delayProcessor: new SpessaSynthDelay(sampleRate)
   };
 }
@@ -7685,9 +7669,6 @@ var SynthesizerSnapshot = class _SynthesizerSnapshot {
       is.type >> 8,
       is.type & 127
     ]);
-    sendAddress2(processor, 64, 3, 23, [is.sendLevelToReverb]);
-    sendAddress2(processor, 64, 3, 24, [is.sendLevelToChorus]);
-    sendAddress2(processor, 64, 3, 25, [is.sendLevelToDelay]);
     for (let i = 0; i < is.params.length; i++) {
       if (is.params[i] !== 255)
         sendAddress2(processor, 64, 3, 3 + i, [is.params[i]]);
@@ -12936,8 +12917,8 @@ function setMasterParameterInternal(parameter, value) {
     case "masterPan": {
       let pan = value;
       pan = pan / 2 + 0.5;
-      this.panLeft = 1 - pan;
-      this.panRight = pan;
+      this.panLeft = Math.cos(Math.PI / 2 * pan);
+      this.panRight = Math.sin(Math.PI / 2 * pan);
       break;
     }
     case "voiceCap": {
@@ -13586,12 +13567,13 @@ function handleGS(syx, channelOffset = 0) {
             if (addr2 === 3) {
               if (this.masterParameters.insertionEffectLock)
                 return;
+              if (addr3 >= 3 && addr3 <= 25)
+                this.insertionParams[addr3 - 3] = data;
               if (addr3 >= 3 && addr3 <= 22) {
                 this.insertionProcessor.setParameter(
                   addr3,
                   data
                 );
-                this.insertionParams[addr3 - 3] = data;
                 coolInfo2(`EFX Parameter ${addr3 - 2}`, data);
                 this.callEvent("effectChange", {
                   effect: "insertion",
@@ -13620,7 +13602,7 @@ function handleGS(syx, channelOffset = 0) {
                       consoleColors.warn
                     );
                   }
-                  this.insertionParams.fill(255);
+                  this.resetInsertionParams();
                   this.insertionProcessor.reset();
                   this.callEvent("effectChange", {
                     effect: "insertion",
@@ -13630,7 +13612,7 @@ function handleGS(syx, channelOffset = 0) {
                   return;
                 }
                 case 23: {
-                  this.insertionProcessor.sendLevelToReverb = data / 127;
+                  this.insertionProcessor.sendLevelToReverb = data / 127 * EFX_SENDS_GAIN_CORRECTION;
                   coolInfo2("EFX Send Level to Reverb", data);
                   this.callEvent("effectChange", {
                     effect: "insertion",
@@ -13640,7 +13622,7 @@ function handleGS(syx, channelOffset = 0) {
                   return;
                 }
                 case 24: {
-                  this.insertionProcessor.sendLevelToChorus = data / 127;
+                  this.insertionProcessor.sendLevelToChorus = data / 127 * EFX_SENDS_GAIN_CORRECTION;
                   coolInfo2("EFX Send Level to Chorus", data);
                   this.callEvent("effectChange", {
                     effect: "insertion",
@@ -13650,7 +13632,7 @@ function handleGS(syx, channelOffset = 0) {
                   return;
                 }
                 case 25: {
-                  this.insertionProcessor.sendLevelToDelay = data / 127;
+                  this.insertionProcessor.sendLevelToDelay = data / 127 * EFX_SENDS_GAIN_CORRECTION;
                   this.delayActive = true;
                   coolInfo2("EFX Send Level to Delay", data);
                   this.callEvent("effectChange", {
@@ -16636,11 +16618,13 @@ var SynthesizerCore = class {
   /**
    * The pan of the left channel.
    */
-  panLeft = 0.5;
+  panLeft = Math.cos(Math.PI / 4);
+  // Center
   /**
    * The pan of the right channel.
    */
-  panRight = 0.5;
+  panRight = Math.cos(Math.PI / 4);
+  // Center
   /**
    * Synth's default (reset) preset.
    */
@@ -16734,10 +16718,12 @@ var SynthesizerCore = class {
   portSelectChannelOffset = 0;
   /**
    * For insertion snapshot tracking
+   * 20 parameters (0-19) + 3 sends
+   * Index to gs is Addr3 - 3 (for example EFX PARAMETER 1 is 0x03 and here it's 0)
    * note: 255 means "no change"
    * @protected
    */
-  insertionParams = new Uint8Array(20).fill(255);
+  insertionParams = new Uint8Array(23).fill(255);
   /**
    * Last time the priorities were assigned.
    * Used to prevent assigning priorities multiple times when more than one voice is triggered during a quantum.
@@ -16767,6 +16753,7 @@ var SynthesizerCore = class {
     this.delayProcessor = options.delayProcessor;
     for (const insertion of insertionList)
       this.registerInsertionProcessor(insertion);
+    this.resetInsertionParams();
     this.voices = [];
     for (let i = 0; i < this.masterParameters.voiceCap; i++) {
       this.voices.push(new Voice(this.sampleRate));
@@ -17210,15 +17197,6 @@ var SynthesizerCore = class {
   getInsertionSnapshot() {
     return {
       type: this.insertionProcessor.type,
-      sendLevelToReverb: Math.floor(
-        this.insertionProcessor.sendLevelToReverb * 127
-      ),
-      sendLevelToChorus: Math.floor(
-        this.insertionProcessor.sendLevelToChorus * 127
-      ),
-      sendLevelToDelay: Math.floor(
-        this.insertionProcessor.sendLevelToDelay * 127
-      ),
       params: this.insertionParams.slice(),
       channels: this.midiChannels.map((c) => c.insertionEnabled)
     };
@@ -17229,15 +17207,21 @@ var SynthesizerCore = class {
   callEvent(eventName, eventData) {
     this.eventCallbackHandler(eventName, eventData);
   }
+  resetInsertionParams() {
+    this.insertionParams.fill(255);
+    this.insertionParams[20] = 40;
+    this.insertionParams[21] = 0;
+    this.insertionParams[22] = 0;
+  }
   resetInsertion() {
     if (this.masterParameters.insertionEffectLock) return;
     this.insertionActive = false;
     this.insertionProcessor = this.insertionFallback;
     this.insertionProcessor.reset();
-    this.insertionProcessor.sendLevelToReverb = 40 / 127;
+    this.insertionProcessor.sendLevelToReverb = 40 / 127 * EFX_SENDS_GAIN_CORRECTION;
     this.insertionProcessor.sendLevelToChorus = 0;
     this.insertionProcessor.sendLevelToDelay = 0;
-    this.insertionParams.fill(255);
+    this.resetInsertionParams();
     this.callEvent("effectChange", {
       effect: "insertion",
       parameter: 0,
@@ -17286,7 +17270,7 @@ var SynthesizerCore = class {
        * This is a special delay in which the delayed sounds move left and right.
        * It is effective when you are listening in stereo.
        */
-      default: {
+      case 0: {
         rev.character = 0;
         rev.preLowpass = 3;
         rev.time = 80;
@@ -17336,6 +17320,10 @@ var SynthesizerCore = class {
         rev.delayFeedback = 32;
         break;
       }
+      default: {
+        SpessaSynthWarn(`Invalid reverb macro: ${macro}`);
+        return;
+      }
     }
     this.callEvent("effectChange", {
       effect: "reverb",
@@ -17369,7 +17357,7 @@ var SynthesizerCore = class {
        * Short Delay (FB)
        * This is a short delay with many repeats.
        */
-      default: {
+      case 0: {
         chr.feedback = 0;
         chr.delay = 112;
         chr.rate = 3;
@@ -17425,6 +17413,10 @@ var SynthesizerCore = class {
         chr.depth = 127;
         break;
       }
+      default: {
+        SpessaSynthWarn(`Invalid chorus macro: ${macro}`);
+        return;
+      }
     }
     this.callEvent("effectChange", {
       effect: "chorus",
@@ -17464,8 +17456,7 @@ var SynthesizerCore = class {
        * but the pan positioning is different from the effects listed above.
        * It is effective when listening in stereo.
        */
-      case 0:
-      default: {
+      case 0: {
         dly.timeCenter = 97;
         dly.timeRatioRight = dly.timeRatioLeft = 1;
         dly.feedback = 80;
@@ -17550,6 +17541,10 @@ var SynthesizerCore = class {
         dly.feedback = 40;
         break;
       }
+      default: {
+        SpessaSynthWarn(`Invalid delay macro: ${macro}`);
+        return;
+      }
     }
     this.callEvent("effectChange", {
       effect: "delay",