spessasynth_core 4.0.16 → 4.0.18

package/dist/index.d.ts

@@ -3822,6 +3822,11 @@ declare class SpessaSynthSequencer {
      * This is used by spessasynth_lib to pass them over to Web MIDI API.
      */
     externalMIDIPlayback: boolean;
+    /**
+     * If the notes that were playing when the sequencer was paused should be re-triggered.
+     * Defaults to true.
+     */
+    retriggerPausedNotes: boolean;
     /**
      * The loop count of the sequencer.
      * If infinite, it will loop forever.
@@ -4001,18 +4006,10 @@ declare class SpessaSynthSequencer {
      */
     protected addNewMIDIPort(): void;
     protected sendMIDIMessage(message: number[]): void;
+    protected sendMIDIAllOff(): void;
     protected sendMIDIReset(): void;
     protected loadCurrentSong(): void;
     protected shuffleSongIndexes(): void;
-    protected sendMIDICC(channel: number, type: number, 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
-     * @param MSB SECOND byte of the MIDI pitchWheel message
-     * @param LSB FIRST byte of the MIDI pitchWheel message
-     */
-    protected sendMIDIPitchWheel(channel: number, MSB: number, LSB: number): void;
     /**
      * Sets the time in MIDI ticks.
      * @param ticks the MIDI ticks to set the time to.
@@ -4023,6 +4020,16 @@ declare class SpessaSynthSequencer {
      * @param time the time in seconds to recalculate the start time for.
      */
     protected recalculateStartTime(time: number): void;
+    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
+     * @param pitch the 14-bit pitch value
+     */
+    protected sendMIDIPitchWheel(channel: number, pitch: number): void;
 }
 
 declare const DEFAULT_MASTER_PARAMETERS: MasterParameterType;

package/dist/index.js

@@ -4734,12 +4734,7 @@ function setTimeToInternal(time, ticks = void 0) {
     return false;
   }
   this.oneTickToSeconds = 60 / (120 * this._midiData.timeDivision);
-  if (this.externalMIDIPlayback) {
-    this.sendMIDIReset();
-  } else {
-    this.synth.resetAllControllers();
-    this.synth.stopAllChannels(false);
-  }
+  this.sendMIDIReset();
   this.playedTime = 0;
   this.eventIndexes = Array(this._midiData.tracks.length).fill(0);
   const channelsToSave = this.synth.midiChannels.length;
@@ -4823,15 +4818,7 @@ function setTimeToInternal(time, ticks = void 0) {
           } else if (controllerNumber === midiControllers.resetAllControllers) {
             resetAllControllers(channel);
           }
-          if (this.externalMIDIPlayback) {
-            this.sendMIDICC(channel, controllerNumber, ccV);
-          } else {
-            this.synth.controllerChange(
-              channel,
-              controllerNumber,
-              ccV
-            );
-          }
+          this.sendMIDICC(channel, controllerNumber, ccV);
         } else {
           savedControllers[channel] ??= Array.from(
             defaultControllerArray
@@ -4859,70 +4846,28 @@ function setTimeToInternal(time, ticks = void 0) {
     }
     this.playedTime += this.oneTickToSeconds * (nextEvent.ticks - event.ticks);
   }
-  if (this.externalMIDIPlayback) {
-    for (let channelNumber = 0; channelNumber < channelsToSave; channelNumber++) {
-      if (pitchWheels[channelNumber] !== void 0) {
-        this.sendMIDIPitchWheel(
-          channelNumber,
-          pitchWheels[channelNumber] >> 7,
-          pitchWheels[channelNumber] & 127
-        );
-      }
-      if (savedControllers[channelNumber] !== void 0) {
-        savedControllers[channelNumber].forEach((value, index) => {
-          if (value !== defaultControllerArray[index] && !isCCNonSkippable(index)) {
-            this.sendMIDICC(channelNumber, index, value);
-          }
-        });
-      }
-      if (programs[channelNumber].program >= 0 && programs[channelNumber].actualBank >= 0) {
-        const bank = programs[channelNumber].actualBank;
+  for (let channel = 0; channel < channelsToSave; channel++) {
+    if (pitchWheels[channel] !== void 0) {
+      this.sendMIDIPitchWheel(channel, pitchWheels[channel]);
+    }
+    if (savedControllers[channel] !== void 0) {
+      savedControllers[channel].forEach((value, index) => {
+        if (value !== defaultControllerArray[index] && !isCCNonSkippable(index)) {
+          this.sendMIDICC(channel, index, value);
+        }
+      });
+    }
+    if (programs[channel].actualBank >= 0) {
+      const p = programs[channel];
+      if (p.program !== -1) {
         this.sendMIDICC(
-          channelNumber,
+          channel,
           midiControllers.bankSelect,
-          bank
+          p.actualBank
         );
-        this.sendMIDIProgramChange(
-          channelNumber,
-          programs[channelNumber].program
-        );
-      }
-    }
-  } else {
-    for (let channelNumber = 0; channelNumber < channelsToSave; channelNumber++) {
-      if (pitchWheels[channelNumber] !== void 0) {
-        this.synth.pitchWheel(
-          channelNumber,
-          pitchWheels[channelNumber]
-        );
-      }
-      if (savedControllers[channelNumber] !== void 0) {
-        savedControllers[channelNumber].forEach((value, index) => {
-          if (value !== defaultControllerArray[index] && !isCCNonSkippable(index)) {
-            this.synth.controllerChange(
-              channelNumber,
-              index,
-              value
-            );
-          }
-        });
-      }
-      if (programs[channelNumber].actualBank >= 0) {
-        const p = programs[channelNumber];
-        if (p.program !== -1) {
-          this.synth.controllerChange(
-            channelNumber,
-            midiControllers.bankSelect,
-            p.actualBank
-          );
-          this.synth.programChange(channelNumber, p.program);
-        } else {
-          this.synth.controllerChange(
-            channelNumber,
-            midiControllers.bankSelect,
-            p.bank
-          );
-        }
+        this.sendMIDIProgramChange(channel, p.program);
+      } else {
+        this.sendMIDICC(channel, midiControllers.bankSelect, p.bank);
       }
     }
   }
@@ -4958,6 +4903,11 @@ var SpessaSynthSequencer = class {
    * This is used by spessasynth_lib to pass them over to Web MIDI API.
    */
   externalMIDIPlayback = false;
+  /**
+   * If the notes that were playing when the sequencer was paused should be re-triggered.
+   * Defaults to true.
+   */
+  retriggerPausedNotes = false;
   /**
    * The loop count of the sequencer.
    * If infinite, it will loop forever.
@@ -4977,7 +4927,7 @@ var SpessaSynthSequencer = class {
    * Indicates if the synthesizer should preload the voices for the newly loaded sequence.
    * Recommended.
    */
-  preload = false;
+  preload = true;
   /**
    * Called when the sequencer calls an event.
    * @param event The event
@@ -5189,9 +5139,9 @@ var SpessaSynthSequencer = class {
     if (this.paused) {
       this.recalculateStartTime(this.pausedTime ?? 0);
     }
-    if (!this.externalMIDIPlayback) {
+    if (this.retriggerPausedNotes) {
       this.playingNotes.forEach((n) => {
-        this.synth.noteOn(n.channel, n.midiNote, n.velocity);
+        this.sendMIDINoteOn(n.channel, n.midiNote, n.velocity);
       });
     }
     this.pausedTime = void 0;
@@ -5248,21 +5198,7 @@ var SpessaSynthSequencer = class {
    */
   stop() {
     this.pausedTime = this.currentTime;
-    for (let i = 0; i < 16; i++) {
-      this.synth.controllerChange(i, midiControllers.sustainPedal, 0);
-    }
-    this.synth.stopAllChannels();
-    if (this.externalMIDIPlayback) {
-      for (const note of this.playingNotes) {
-        this.sendMIDIMessage([
-          midiMessageTypes.noteOff | note.channel % 16,
-          note.midiNote
-        ]);
-      }
-      for (let c = 0; c < MIDI_CHANNEL_COUNT; c++) {
-        this.sendMIDICC(c, midiControllers.allNotesOff, 0);
-      }
-    }
+    this.sendMIDIAllOff();
   }
   /**
    * @returns the index of the first to the current played time
@@ -5292,24 +5228,36 @@ var SpessaSynthSequencer = class {
   }
   sendMIDIMessage(message) {
     if (!this.externalMIDIPlayback) {
+      SpessaSynthWarn(
+        `Attempting to send ${arrayToHexString(message)} to the synthesizer via sendMIDIMessage. This shouldn't happen!`
+      );
       return;
     }
     this.callEvent("midiMessage", { message });
   }
+  sendMIDIAllOff() {
+    for (let i = 0; i < 16; i++) {
+      this.sendMIDICC(i, midiControllers.sustainPedal, 0);
+    }
+    if (!this.externalMIDIPlayback) {
+      this.synth.stopAllChannels();
+      return;
+    }
+    this.playingNotes.forEach((note) => {
+      this.sendMIDINoteOff(note.channel, note.midiNote);
+    });
+    for (let c = 0; c < MIDI_CHANNEL_COUNT; c++) {
+      this.sendMIDICC(c, midiControllers.allNotesOff, 0);
+      this.sendMIDICC(c, midiControllers.allSoundOff, 0);
+    }
+  }
   sendMIDIReset() {
-    this.sendMIDIMessage([midiMessageTypes.reset]);
-    for (let ch = 0; ch < MIDI_CHANNEL_COUNT; ch++) {
-      this.sendMIDIMessage([
-        midiMessageTypes.controllerChange | ch,
-        midiControllers.allSoundOff,
-        0
-      ]);
-      this.sendMIDIMessage([
-        midiMessageTypes.controllerChange | ch,
-        midiControllers.resetAllControllers,
-        0
-      ]);
+    this.sendMIDIAllOff();
+    if (!this.externalMIDIPlayback) {
+      this.synth.resetAllControllers();
+      return;
     }
+    this.sendMIDIMessage([midiMessageTypes.reset]);
   }
   loadCurrentSong() {
     let index = this._songIndex;
@@ -5327,11 +5275,65 @@ var SpessaSynthSequencer = class {
       indexes.splice(indexes.indexOf(index), 1);
     }
   }
-  sendMIDICC(channel, type, value) {
+  /**
+   * Sets the time in MIDI ticks.
+   * @param ticks the MIDI ticks to set the time to.
+   */
+  setTimeTicks(ticks) {
+    if (!this._midiData) {
+      return;
+    }
+    this.playingNotes = [];
+    const seconds = this._midiData.midiTicksToSeconds(ticks);
+    this.callEvent("timeChange", { newTime: seconds });
+    const isNotFinished = this.setTimeTo(0, ticks);
+    this.recalculateStartTime(this.playedTime);
+    if (!isNotFinished) {
+      return;
+    }
+  }
+  /**
+   * Recalculates the absolute start time of the sequencer.
+   * @param time the time in seconds to recalculate the start time for.
+   */
+  recalculateStartTime(time) {
+    this.absoluteStartTime = this.synth.currentSynthTime - time / this._playbackRate;
+  }
+  /*
+  SEND MIDI METHOD ABSTRACTIONS
+  These abstract the difference between spessasynth and external MIDI
+   */
+  sendMIDINoteOn(channel, midiNote, velocity) {
+    if (!this.externalMIDIPlayback) {
+      this.synth.noteOn(channel, midiNote, velocity);
+      return;
+    }
     channel %= 16;
+    this.sendMIDIMessage([
+      midiMessageTypes.noteOn | channel,
+      midiNote,
+      velocity
+    ]);
+  }
+  sendMIDINoteOff(channel, midiNote) {
     if (!this.externalMIDIPlayback) {
+      this.synth.noteOff(channel, midiNote);
       return;
     }
+    channel %= 16;
+    this.sendMIDIMessage([
+      midiMessageTypes.noteOff | channel,
+      midiNote,
+      64
+      // Make sure to send velocity as well
+    ]);
+  }
+  sendMIDICC(channel, type, value) {
+    if (!this.externalMIDIPlayback) {
+      this.synth.controllerChange(channel, type, value);
+      return;
+    }
+    channel %= 16;
     this.sendMIDIMessage([
       midiMessageTypes.controllerChange | channel,
       type,
@@ -5339,10 +5341,11 @@ var SpessaSynthSequencer = class {
     ]);
   }
   sendMIDIProgramChange(channel, program) {
-    channel %= 16;
     if (!this.externalMIDIPlayback) {
+      this.synth.programChange(channel, program);
       return;
     }
+    channel %= 16;
     this.sendMIDIMessage([
       midiMessageTypes.programChange | channel,
       program
@@ -5351,39 +5354,19 @@ var SpessaSynthSequencer = class {
   /**
    * Sets the pitch of the given channel
    * @param channel usually 0-15: the channel to change pitch
-   * @param MSB SECOND byte of the MIDI pitchWheel message
-   * @param LSB FIRST byte of the MIDI pitchWheel message
+   * @param pitch the 14-bit pitch value
    */
-  sendMIDIPitchWheel(channel, MSB, LSB) {
-    channel %= 16;
+  sendMIDIPitchWheel(channel, pitch) {
     if (!this.externalMIDIPlayback) {
+      this.synth.pitchWheel(channel, pitch);
       return;
     }
-    this.sendMIDIMessage([midiMessageTypes.pitchWheel | channel, LSB, MSB]);
-  }
-  /**
-   * Sets the time in MIDI ticks.
-   * @param ticks the MIDI ticks to set the time to.
-   */
-  setTimeTicks(ticks) {
-    if (!this._midiData) {
-      return;
-    }
-    this.playingNotes = [];
-    const seconds = this._midiData.midiTicksToSeconds(ticks);
-    this.callEvent("timeChange", { newTime: seconds });
-    const isNotFinished = this.setTimeTo(0, ticks);
-    this.recalculateStartTime(this.playedTime);
-    if (!isNotFinished) {
-      return;
-    }
-  }
-  /**
-   * Recalculates the absolute start time of the sequencer.
-   * @param time the time in seconds to recalculate the start time for.
-   */
-  recalculateStartTime(time) {
-    this.absoluteStartTime = this.synth.currentSynthTime - time / this._playbackRate;
+    channel %= 16;
+    this.sendMIDIMessage([
+      midiMessageTypes.pitchWheel | channel,
+      pitch & 127,
+      pitch >> 7
+    ]);
   }
 };