spessasynth_core 4.3.4 → 4.3.6

package/dist/index.d.ts

@@ -1663,7 +1663,8 @@ interface ChannelMIDIParameter {
   /**
    * If the channel is in the poly mode.
    * - `true` - POLY ON - regular playback.
-   * - `false` - MONO ON - one note per channel, others are killed on Note On.
+   * - `false` - MONO ON - one note per channel,
+   * highest still pressed note is restored after releasing the currently playing one.
    */
   polyMode: boolean;
   /**
@@ -2045,6 +2046,20 @@ declare class MIDIChannel {
    */
   protected readonly octaveTuning: Int8Array;
   protected readonly _midiParameters: Readonly<ChannelMIDIParameter>;
+  /**
+   * Note On message tracking, for grouping voices for specific Note On messages.
+   * Used for overlapping Note Ons.
+   * MIDI note: current note on ID
+   * @protected
+   */
+  protected readonly noteOnID: number[];
+  /**
+   * Note Off message tracking, for grouping voices for specific Note On messages.
+   * Used for overlapping Note Ons.
+   * MIDI note: current note on ID
+   * @protected
+   */
+  protected readonly noteOffID: number[];
   /**
    * If the last Parameter was RPN.
    * If false then the last parameter was NRPN.
@@ -2080,21 +2095,39 @@ declare class MIDIChannel {
    */
   protected currentGain: number;
   /**
-   * The last pressed note on this channel.
+   * The last pressed note on this channel for portamento tracking.
    * -1 means none.
    * This is not a `ChannelMIDIParameter` and is strictly internal,
    * mostly because we don't want to send events for every note on message.
    * It can be set with Portamento Control CC anyway.
    * @protected
    */
-  protected lastNote: number;
+  protected lastPortamentoNote: number;
   /**
    * If the portamento should be executed once regardless of Portamento on/off.
    * Adhering to the MIDI spec, CC#84 ignores on/off.
-   * This is also not a `ChannelMIDIParameter` for the same reason as `lastNote`
+   * This is also not a `ChannelMIDIParameter` for the same reason as `lastPortamentoNote`
    * @protected
    */
   protected portamentoForce: boolean;
+  /**
+   * The last pressed note on this channel in mono mode.
+   * Used for tracking and releasing this note on a new Note On event.
+   * -1 means none.
+   * @protected
+   */
+  protected lastMonoNote: number;
+  /**
+   * The last pressed note's velocity on this channel in mono mode.
+   * @protected
+   */
+  protected lastMonoVelocity: number;
+  /**
+   * For Mono Mode restoring notes.
+   * playingNotes[midiNote]
+   * @protected
+   */
+  protected readonly playingNotes: boolean[];
   protected readonly generators: ChannelGenerators;
   protected readonly computeModulator: (voice: Voice, pitchWheel: number, modulatorIndex: number) => number;
   protected readonly computeModulators: (voice: Voice, sourceUsesCC?: 0 | 1 | -1 | undefined, sourceIndex?: number | undefined) => void;
@@ -3070,6 +3103,11 @@ declare class Voice {
    * MIDI channel number of the voice.
    */
   channel: number;
+  /**
+   * Grouping voices for specific Note On messages.
+   * Used for overlapping Note Ons.
+   */
+  noteID: number;
   /**
    * MIDI note number of the voice.
    * Direct number from the Note On message and is
@@ -3183,7 +3221,7 @@ declare class Voice {
    * @param minNoteLength minimum note length in seconds
    */
   releaseVoice(currentTime: number, minNoteLength?: number): void;
-  setup(currentTime: number, channel: number, midiNote: number): void;
+  setup(currentTime: number, channel: number, midiNote: number, noteID: number): void;
 }
 //#endregion
 //#region src/soundbank/basic_soundbank/modulator_source.d.ts

package/dist/index.js

@@ -2585,13 +2585,13 @@ function getNoteTimesInternal(midi, minDrumLength = 0) {
 	const unfinishedNotes = [];
 	for (let i = 0; i < 16; i++) unfinishedNotes.push(/* @__PURE__ */ new Map());
 	const noteOff = (midiNote, channel) => {
-		const ch = unfinishedNotes[channel];
-		const noteIndex = ch.get(midiNote);
+		const noteIndexes = unfinishedNotes[channel].get(midiNote);
+		if (noteIndexes === void 0) return;
+		const noteIndex = noteIndexes.shift();
 		if (noteIndex === void 0) return;
 		const note = noteTimes[channel][noteIndex];
 		const time = elapsedTime - note.start;
 		note.length = channel === 9 ? Math.max(time, minDrumLength) : time;
-		ch.delete(midiNote);
 		unfinished--;
 	};
 	const { timeline, tracks } = midi;
@@ -2606,7 +2606,6 @@ function getNoteTimesInternal(midi, minDrumLength = 0) {
 			const velocity = event.data[1];
 			if (velocity === 0) noteOff(midiNote, channel);
 			else {
-				noteOff(midiNote, channel);
 				const noteTime = {
 					midiNote,
 					start: elapsedTime,
@@ -2615,14 +2614,17 @@ function getNoteTimesInternal(midi, minDrumLength = 0) {
 				};
 				const times = noteTimes[channel];
 				times.push(noteTime);
-				unfinishedNotes[channel].set(midiNote, times.length - 1);
+				const unfinishedChannel = unfinishedNotes[channel];
+				if (!unfinishedChannel.has(midiNote)) unfinishedChannel.set(midiNote, []);
+				unfinishedNotes[channel].get(midiNote)?.push(times.length - 1);
 				unfinished++;
 			}
 		} else if (event.statusByte === 81) oneTickToSeconds = 60 / (getTempo(event) * midi.timeDivision);
 		if (++i >= timeline.length) break;
-		elapsedTime += oneTickToSeconds * (tracks[timeline[i].tr].events[timeline[i].ev].ticks - event.ticks);
+		const nextTimeline = timeline[i];
+		elapsedTime += oneTickToSeconds * (tracks[nextTimeline.tr].events[nextTimeline.ev].ticks - event.ticks);
 	}
-	if (unfinished > 0) for (let channel = 0; channel < unfinishedNotes.length; channel++) for (const noteIndex of unfinishedNotes[channel].values()) {
+	if (unfinished > 0) for (let channel = 0; channel < unfinishedNotes.length; channel++) for (const noteIndexes of unfinishedNotes[channel].values()) for (const noteIndex of noteIndexes) {
 		const note = noteTimes[channel][noteIndex];
 		note.length = elapsedTime - note.start;
 	}
@@ -4490,20 +4492,31 @@ function processEventInternal(event, trackIndex) {
 	channel += offset;
 	switch (status) {
 		case MIDIMessageTypes.noteOn: {
+			let playingNotes = this.playingNotes[channel];
+			if (!playingNotes) {
+				while (this.playingNotes.length <= channel) this.playingNotes.push(/* @__PURE__ */ new Map());
+				playingNotes = this.playingNotes[channel];
+			}
 			const velocity = event.data[1];
 			if (velocity > 0) {
 				this.synth.noteOn(channel, event.data[0], velocity);
-				this.playingNotes[channel].set(event.data[0], velocity);
+				playingNotes.set(event.data[0], velocity);
 			} else {
 				this.synth.noteOff(channel, event.data[0]);
-				this.playingNotes[channel].delete(event.data[0]);
+				playingNotes.delete(event.data[0]);
 			}
 			break;
 		}
-		case MIDIMessageTypes.noteOff:
+		case MIDIMessageTypes.noteOff: {
+			let playingNotes = this.playingNotes[channel];
+			if (!playingNotes) {
+				while (this.playingNotes.length <= channel) this.playingNotes.push(/* @__PURE__ */ new Map());
+				playingNotes = this.playingNotes[channel];
+			}
 			this.synth.noteOff(channel, event.data[0]);
-			this.playingNotes[channel].delete(event.data[0]);
+			playingNotes.delete(event.data[0]);
 			break;
+		}
 		case MIDIMessageTypes.pitchWheel:
 			this.synth.pitchWheel(channel, event.data[1] << 7 | event.data[0]);
 			break;
@@ -4654,7 +4667,7 @@ function loadNewSequenceInternal(parsedMIDI) {
 //#endregion
 //#region src/synthesizer/audio_engine/channel/reset.ts
 function resetPortamento() {
-	this.lastNote = this.channelSystem === "xg" ? 60 : -1;
+	this.lastPortamentoNote = this.channelSystem === "xg" ? 60 : -1;
 }
 /**
 * An array with the default MIDI controller values.
@@ -4722,6 +4735,7 @@ function resetChannelInternal(sendCCEvents = true) {
 	this.resetGeneratorOffsets();
 	this.dynamicModulators.resetModulators();
 	this.sf2NRPNGeneratorLSB = 0;
+	this.playingNotes.fill(false);
 	this.lastParameterIsRegistered = true;
 	this._midiControllers[MIDIControllers.nonRegisteredParameterLSB] = 0;
 	this._midiControllers[MIDIControllers.nonRegisteredParameterMSB] = 0;
@@ -5041,7 +5055,7 @@ var SpessaSynthSequencer = class {
 	constructor(spessasynthProcessor) {
 		this.synth = spessasynthProcessor;
 		this.absoluteStartTime = this.synth.currentTime;
-		for (let i = 0; i < 16; i++) this.playingNotes.push(/* @__PURE__ */ new Map());
+		this.playingNotes = this.synth.midiChannels.map(() => /* @__PURE__ */ new Map());
 	}
 	_midiData;
 	/**
@@ -7378,6 +7392,11 @@ var Voice = class {
 	*/
 	channel = 0;
 	/**
+	* Grouping voices for specific Note On messages.
+	* Used for overlapping Note Ons.
+	*/
+	noteID = 0;
+	/**
 	* MIDI note number of the voice.
 	* Direct number from the Note On message and is
 	* used for Note Off and external parameters:
@@ -7500,7 +7519,7 @@ var Voice = class {
 		this.releaseStartTime = currentTime;
 		if (this.releaseStartTime - this.startTime < minNoteLength) this.releaseStartTime = this.startTime + minNoteLength;
 	}
-	setup(currentTime, channel, midiNote) {
+	setup(currentTime, channel, midiNote, noteID) {
 		this.isActive = true;
 		this.isInRelease = false;
 		this.hasRendered = false;
@@ -7515,6 +7534,7 @@ var Voice = class {
 		this.startTime = currentTime;
 		this.channel = channel;
 		this.midiNote = midiNote;
+		this.noteID = noteID;
 	}
 };
 //#endregion
@@ -12159,7 +12179,7 @@ function controllerChange(controller, value, sendEvent = true) {
 			}
 			break;
 		case MIDIControllers.portamentoControl:
-			this.lastNote = value;
+			this.lastPortamentoNote = value;
 			this.portamentoForce = true;
 			break;
 		default:
@@ -12572,8 +12592,9 @@ const clamp = (num, min, max) => Math.max(min, Math.min(max, num));
 * Sends a "MIDI Note on" message and starts a note.
 * @param midiNote The MIDI note number (0-127).
 * @param velocity The velocity of the note (0-127). If less than 1, it will send a note off instead.
+* @param emit If the note on should be updated and emitted (non-internal)
 */
-function noteOn(midiNote, velocity) {
+function noteOn(midiNote, velocity, emit = true) {
 	if (velocity < 1) {
 		this.noteOff(midiNote);
 		return;
@@ -12590,7 +12611,7 @@ function noteOn(midiNote, velocity) {
 	const keyVel = this.synthCore.keyModifierManager.getVelocity(this.channel, midiNote);
 	if (keyVel > -1) velocity = keyVel;
 	let voiceGain = this.synthCore.keyModifierManager.getGain(this.channel, midiNote);
-	const previousNote = this.lastNote;
+	const previousNote = this.lastPortamentoNote;
 	const portamentoEnabled = this.portamentoForce || this._midiControllers[MIDIControllers.portamentoOnOff] >= 8192;
 	const portamentoTime = this._midiControllers[MIDIControllers.portamentoTime] >> 7;
 	const canApplyPortamento = portamentoEnabled && !this._drumChannel && previousNote >= 0 && previousNote !== midiNote && portamentoTime > 0;
@@ -12602,15 +12623,12 @@ function noteOn(midiNote, velocity) {
 		portaTime = portamentoTimeToSeconds(portamentoTime, keyDistance);
 		this.portamentoForce = false;
 	}
-	this.lastNote = midiNote;
+	this.lastPortamentoNote = midiNote;
+	this.playingNotes[midiNote] = true;
 	if (!this._midiParameters.polyMode) {
-		let vc = 0;
-		if (this._voiceCount > 0) {
-			for (const v of this.synthCore.voices) if (v.isActive && v.channel === this.channel) {
-				v.exclusiveRelease(this.synthCore.currentTime, 0);
-				if (++vc >= this._voiceCount) break;
-			}
-		}
+		if (this.lastMonoNote >= 0 && this.lastMonoNote !== midiNote) this.killNote(this.lastMonoNote);
+		this.lastMonoNote = midiNote;
+		this.lastMonoVelocity = velocity;
 	}
 	const voices = this.synthCore.getVoices(this.channel, soundBankNote, velocity);
 	let panOverride = 0;
@@ -12636,10 +12654,11 @@ function noteOn(midiNote, velocity) {
 		delaySend = p.delayGain;
 		if (voiceGain === 1) voiceGain = p.gain;
 	}
+	const noteID = emit ? this.noteOnID[midiNote]++ : this.noteOnID[midiNote];
 	for (const cached of voices) {
 		const voice = this.synthCore.assignVoice();
 		const now = this.synthCore.currentTime;
-		voice.setup(now, this.channel, midiNote);
+		voice.setup(now, this.channel, midiNote, noteID);
 		voice.wavetable = voice.oscillators[this._systemParameters.interpolationType ?? this.synthCore.systemParameters.interpolationType];
 		voice.targetKey = cached.targetKey;
 		voice.velocity = cached.velocity;
@@ -12712,7 +12731,7 @@ function noteOn(midiNote, velocity) {
 		voice.currentPan = Math.max(-500, Math.min(500, panOverride || voice.modulatedGenerators[GeneratorTypes.pan]));
 	}
 	this._voiceCount += voices.length;
-	this.synthCore.callEvent("noteOn", {
+	if (emit) this.synthCore.callEvent("noteOn", {
 		midiNote,
 		channel: this.channel,
 		velocity
@@ -12736,10 +12755,14 @@ function noteOff(midiNote) {
 		});
 		return;
 	}
-	const sustain = this._midiControllers[MIDIControllers.sustainPedal] >= 8192;
+	this.playingNotes[midiNote] = false;
+	const mono = !this._midiParameters.polyMode;
+	const sustain = this._midiControllers[MIDIControllers.sustainPedal] >= 8192 && !mono;
 	let vc = 0;
+	const noteID = this.noteOffID[midiNote];
+	if (noteID < this.noteOnID[midiNote]) this.noteOffID[midiNote]++;
 	if (this._voiceCount > 0) {
-		for (const v of this.synthCore.voices) if (v.channel === this.channel && v.isActive && v.midiNote === midiNote && !v.isInRelease) {
+		for (const v of this.synthCore.voices) if (v.channel === this.channel && v.isActive && v.midiNote === midiNote && v.noteID === noteID && !v.isInRelease) {
 			if (sustain) v.isHeld = true;
 			else v.releaseVoice(this.synthCore.currentTime);
 			if (++vc >= this._voiceCount) break;
@@ -12749,6 +12772,11 @@ function noteOff(midiNote) {
 		midiNote,
 		channel: this.channel
 	});
+	if (mono) {
+		const highest = this.playingNotes.lastIndexOf(true);
+		if (highest === -1) this.lastMonoNote = -1;
+		else if (this.lastMonoNote === midiNote) this.noteOn(highest, this.lastMonoVelocity, false);
+	}
 }
 //#endregion
 //#region src/synthesizer/audio_engine/channel/program_change.ts
@@ -13270,6 +13298,20 @@ var MIDIChannel = class {
 	*/
 	_systemParameters = { ...DEFAULT_CHANNEL_SYSTEM_PARAMETERS };
 	/**
+	* Note On message tracking, for grouping voices for specific Note On messages.
+	* Used for overlapping Note Ons.
+	* MIDI note: current note on ID
+	* @protected
+	*/
+	noteOnID = new Array(128).fill(0);
+	/**
+	* Note Off message tracking, for grouping voices for specific Note On messages.
+	* Used for overlapping Note Ons.
+	* MIDI note: current note on ID
+	* @protected
+	*/
+	noteOffID = new Array(128).fill(0);
+	/**
 	* If the last Parameter was RPN.
 	* If false then the last parameter was NRPN.
 	* @protected
@@ -13304,21 +13346,39 @@ var MIDIChannel = class {
 	*/
 	currentGain = 0;
 	/**
-	* The last pressed note on this channel.
+	* The last pressed note on this channel for portamento tracking.
 	* -1 means none.
 	* This is not a `ChannelMIDIParameter` and is strictly internal,
 	* mostly because we don't want to send events for every note on message.
 	* It can be set with Portamento Control CC anyway.
 	* @protected
 	*/
-	lastNote = -1;
+	lastPortamentoNote = -1;
 	/**
 	* If the portamento should be executed once regardless of Portamento on/off.
 	* Adhering to the MIDI spec, CC#84 ignores on/off.
-	* This is also not a `ChannelMIDIParameter` for the same reason as `lastNote`
+	* This is also not a `ChannelMIDIParameter` for the same reason as `lastPortamentoNote`
 	* @protected
 	*/
 	portamentoForce = false;
+	/**
+	* The last pressed note on this channel in mono mode.
+	* Used for tracking and releasing this note on a new Note On event.
+	* -1 means none.
+	* @protected
+	*/
+	lastMonoNote = -1;
+	/**
+	* The last pressed note's velocity on this channel in mono mode.
+	* @protected
+	*/
+	lastMonoVelocity = 0;
+	/**
+	* For Mono Mode restoring notes.
+	* playingNotes[midiNote]
+	* @protected
+	*/
+	playingNotes = new Array(128).fill(false);
 	generators = {
 		offsets: new Int16Array(GENERATORS_AMOUNT),
 		offsetsEnabled: false,
@@ -13431,6 +13491,9 @@ var MIDIChannel = class {
 	* @param force If true, stops all notes immediately, otherwise applies release time.
 	*/
 	stopAllNotes(force = false) {
+		this.noteOnID.fill(0);
+		this.noteOffID.fill(0);
+		this.playingNotes.fill(false);
 		if (force) {
 			let vc = 0;
 			if (this._voiceCount > 0) {
@@ -13633,6 +13696,8 @@ var MIDIChannel = class {
 	*/
 	killNote(midiNote, releaseTime = -12e3) {
 		let vc = 0;
+		this.noteOffID[midiNote] = 0;
+		this.noteOnID[midiNote] = 0;
 		if (this._voiceCount > 0) {
 			for (const v of this.synthCore.voices) if (v.channel === this.channel && v.isActive && v.midiNote === midiNote) {
 				v.overrideReleaseVolEnv = releaseTime;
@@ -13663,7 +13728,7 @@ var MIDIChannel = class {
 	* @param midiNote
 	*/
 	setLastNote(midiNote) {
-		this.lastNote = midiNote;
+		this.lastPortamentoNote = midiNote;
 	}
 	/**
 	* @internal
@@ -20467,7 +20532,6 @@ var SpessaSynthProcessor = class {
 	applySnapshot(snapshot) {
 		this.savedSnapshot = snapshot;
 		applySnapshot$1.call(this.synthCore, snapshot);
-		this.reset();
 	}
 	/**
 	* Gets a synthesizer snapshot from this processor instance.