spessasynth_core 4.3.2 → 4.3.4

package/dist/index.d.ts

@@ -956,11 +956,17 @@ declare class BasicSample {
    */
   sampleType: SampleType;
   /**
-   * Relative to the start of the sample in sample points.
+   * The sample's loop start index, inclusive.
+   * In sample data points, relative to the start of the sample.
+   *
+   * Minimum allowed value is 0.
    */
   loopStart: number;
   /**
-   * Relative to the start of the sample in sample points.
+   * The sample's loop end index, exclusive.
+   * In sample data points, relative to the start of the sample.
+   *
+   * Maximum allowed value is the sample data length.
    */
   loopEnd: number;
   /**
@@ -981,14 +987,14 @@ declare class BasicSample {
    */
   protected audioData?: Float32Array;
   /**
-   * The basic representation of a sample
-   * @param sampleName The sample's name
-   * @param sampleRate The sample's rate in Hz
-   * @param originalKey The sample's pitch as a MIDI note number
-   * @param pitchCorrection The sample's pitch correction in cents
-   * @param sampleType The sample's type, an enum that can indicate SF3
-   * @param loopStart The sample's loop start relative to the sample start in sample points
-   * @param loopEnd The sample's loop end relative to the sample start in sample points
+   * The basic representation of a sample.
+   * @param sampleName The sample's name.
+   * @param sampleRate The sample's rate in Hz.
+   * @param originalKey The sample's pitch as a MIDI note number.
+   * @param pitchCorrection The sample's pitch correction in cents.
+   * @param sampleType The sample's type, an enum that can indicate SF3.
+   * @param loopStart The sample's loop start relative to the sample start in sample points.
+   * @param loopEnd The sample's loop end relative to the sample start in sample points. Inclusive.
    */
   constructor(sampleName: string, sampleRate: number, originalKey: number, pitchCorrection: number, sampleType: SampleType, loopStart: number, loopEnd: number);
   /**
@@ -2952,11 +2958,12 @@ declare abstract class WavetableOscillator {
   playbackStep: number;
   /**
    * Start position of the loop.
+   * Inclusive.
    */
   loopStart: number;
   /**
    * End position of the loop.
-   * INCLUSIVE!!
+   * Exclusive.
    */
   loopEnd: number;
   /**
@@ -2966,6 +2973,7 @@ declare abstract class WavetableOscillator {
   loopLength: number;
   /**
    * End position of the sample.
+   * Exclusive
    */
   end: number;
   /**

package/dist/index.js

@@ -2583,16 +2583,15 @@ function getNoteTimesInternal(midi, minDrumLength = 0) {
 	let i = 0;
 	let unfinished = 0;
 	const unfinishedNotes = [];
-	for (let i = 0; i < 16; i++) unfinishedNotes.push([]);
+	for (let i = 0; i < 16; i++) unfinishedNotes.push(/* @__PURE__ */ new Map());
 	const noteOff = (midiNote, channel) => {
-		const noteIndex = unfinishedNotes[channel].findIndex((n) => n.midiNote === midiNote);
-		const note = unfinishedNotes[channel][noteIndex];
-		if (note) {
-			const time = elapsedTime - note.start;
-			note.length = time;
-			if (channel === 9) note.length = Math.max(time, minDrumLength);
-			unfinishedNotes[channel].splice(noteIndex, 1);
-		}
+		const ch = unfinishedNotes[channel];
+		const noteIndex = ch.get(midiNote);
+		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;
@@ -2602,27 +2601,30 @@ function getNoteTimesInternal(midi, minDrumLength = 0) {
 		const status = event.statusByte >> 4;
 		const channel = event.statusByte & 15;
 		if (status === 8) noteOff(event.data[0], channel);
-		else if (status === 9) if (event.data[1] === 0) noteOff(event.data[0], channel);
-		else {
-			noteOff(event.data[0], channel);
-			const noteTime = {
-				midiNote: event.data[0],
-				start: elapsedTime,
-				length: -1,
-				velocity: event.data[1] / 127
-			};
-			noteTimes[channel].push(noteTime);
-			unfinishedNotes[channel].push(noteTime);
-			unfinished++;
-		}
-		else if (event.statusByte === 81) oneTickToSeconds = 60 / (getTempo(event) * midi.timeDivision);
+		else if (status === 9) {
+			const midiNote = event.data[0];
+			const velocity = event.data[1];
+			if (velocity === 0) noteOff(midiNote, channel);
+			else {
+				noteOff(midiNote, channel);
+				const noteTime = {
+					midiNote,
+					start: elapsedTime,
+					length: -1,
+					velocity
+				};
+				const times = noteTimes[channel];
+				times.push(noteTime);
+				unfinishedNotes[channel].set(midiNote, 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);
 	}
-	if (unfinished > 0) for (const [channel, channelNotes] of unfinishedNotes.entries()) for (const note of channelNotes) {
-		const time = elapsedTime - note.start;
-		note.length = time;
-		if (channel === 9) note.length = Math.max(time, minDrumLength);
+	if (unfinished > 0) for (let channel = 0; channel < unfinishedNotes.length; channel++) for (const noteIndex of unfinishedNotes[channel].values()) {
+		const note = noteTimes[channel][noteIndex];
+		note.length = elapsedTime - note.start;
 	}
 	return noteTimes;
 }
@@ -6004,8 +6006,8 @@ function applySnapshot$1(snapshot) {
 	this.systemExclusive(MIDIUtils.gsData(64, 3, 0, [is.type >> 8, is.type & 127]));
 	for (let i = 0; i < is.params.length; i++) if (is.params[i] !== 255) this.systemExclusive(MIDIUtils.gsData(64, 3, 3 + i, [is.params[i]]));
 	for (let channel = 0; channel < is.channels.length; channel++) this.systemExclusive(MIDIUtils.gsData(64, 64 | MIDIUtils.channelToSyx(channel), 34, [is.channels[channel] ? 1 : 0]));
-	for (const [parameter, value] of Object.entries(this.midiParameters)) this.setMIDIParameter(parameter, value);
-	for (const [parameter, value] of Object.entries(this.systemParameters)) this.setSystemParameter(parameter, value);
+	for (const [parameter, value] of Object.entries(snapshot.midiParameters)) this.setMIDIParameter(parameter, value);
+	for (const [parameter, value] of Object.entries(snapshot.systemParameters)) this.setSystemParameter(parameter, value);
 }
 function getSynthesizerSnapshot() {
 	return {
@@ -7150,11 +7152,12 @@ var WavetableOscillator = class {
 	playbackStep = 0;
 	/**
 	* Start position of the loop.
+	* Inclusive.
 	*/
 	loopStart = 0;
 	/**
 	* End position of the loop.
-	* INCLUSIVE!!
+	* Exclusive.
 	*/
 	loopEnd = 0;
 	/**
@@ -7164,6 +7167,7 @@ var WavetableOscillator = class {
 	loopLength = 0;
 	/**
 	* End position of the sample.
+	* Exclusive
 	*/
 	end = 0;
 	/**
@@ -7178,10 +7182,10 @@ var LinearOscillator = class extends WavetableOscillator {
 		const { loopEnd, loopLength, end } = this;
 		let cursor = this.cursor;
 		if (this.isLooping) for (let i = 0; i < sampleCount; i++) {
-			if (cursor > loopEnd) cursor -= loopLength;
+			while (cursor >= loopEnd) cursor -= loopLength;
 			const floor = cursor | 0;
 			let ceil = floor + 1;
-			if (ceil > loopEnd) ceil -= loopLength;
+			if (ceil >= loopEnd) ceil -= loopLength;
 			const fraction = cursor - floor;
 			const upper = data[ceil];
 			const lower = data[floor];
@@ -7212,7 +7216,7 @@ var NearestOscillator = class extends WavetableOscillator {
 		const { loopEnd, loopLength, end } = this;
 		let cursor = this.cursor;
 		if (this.isLooping) for (let i = 0; i < sampleCount; i++) {
-			if (cursor > loopEnd) cursor -= loopLength;
+			while (cursor >= loopEnd) cursor -= loopLength;
 			outputBuffer[i] = sampleData[cursor | 0];
 			cursor += step;
 		}
@@ -7235,15 +7239,15 @@ var HermiteOscillator = class extends WavetableOscillator {
 		const { loopEnd, loopLength, end } = this;
 		let cursor = this.cursor;
 		if (this.isLooping) for (let i = 0; i < sampleCount; i++) {
-			if (cursor > loopEnd) cursor -= loopLength;
+			while (cursor >= loopEnd) cursor -= loopLength;
 			const y0 = cursor | 0;
 			let y1 = y0 + 1;
 			let y2 = y0 + 2;
 			let y3 = y0 + 3;
 			const t = cursor - y0;
-			if (y1 > loopEnd) y1 -= loopLength;
-			if (y2 > loopEnd) y2 -= loopLength;
-			if (y3 > loopEnd) y3 -= loopLength;
+			if (y1 >= loopEnd) y1 -= loopLength;
+			if (y2 >= loopEnd) y2 -= loopLength;
+			if (y3 >= loopEnd) y3 -= loopLength;
 			const xm1 = sampleData[y0];
 			const x0 = sampleData[y1];
 			const x1 = sampleData[y2];
@@ -7959,11 +7963,17 @@ var BasicSample = class {
 	*/
 	sampleType;
 	/**
-	* Relative to the start of the sample in sample points.
+	* The sample's loop start index, inclusive.
+	* In sample data points, relative to the start of the sample.
+	*
+	* Minimum allowed value is 0.
 	*/
 	loopStart;
 	/**
-	* Relative to the start of the sample in sample points.
+	* The sample's loop end index, exclusive.
+	* In sample data points, relative to the start of the sample.
+	*
+	* Maximum allowed value is the sample data length.
 	*/
 	loopEnd;
 	/**
@@ -7984,14 +7994,14 @@ var BasicSample = class {
 	*/
 	audioData;
 	/**
-	* The basic representation of a sample
-	* @param sampleName The sample's name
-	* @param sampleRate The sample's rate in Hz
-	* @param originalKey The sample's pitch as a MIDI note number
-	* @param pitchCorrection The sample's pitch correction in cents
-	* @param sampleType The sample's type, an enum that can indicate SF3
-	* @param loopStart The sample's loop start relative to the sample start in sample points
-	* @param loopEnd The sample's loop end relative to the sample start in sample points
+	* The basic representation of a sample.
+	* @param sampleName The sample's name.
+	* @param sampleRate The sample's rate in Hz.
+	* @param originalKey The sample's pitch as a MIDI note number.
+	* @param pitchCorrection The sample's pitch correction in cents.
+	* @param sampleType The sample's type, an enum that can indicate SF3.
+	* @param loopStart The sample's loop start relative to the sample start in sample points.
+	* @param loopEnd The sample's loop end relative to the sample start in sample points. Inclusive.
 	*/
 	constructor(sampleName, sampleRate, originalKey, pitchCorrection, sampleType, loopStart, loopEnd) {
 		this.name = sampleName;
@@ -12678,18 +12688,18 @@ function noteOn(midiNote, velocity) {
 		const endOffset = voice.modulatedGenerators[GeneratorTypes.endAddrOffset] + voice.modulatedGenerators[GeneratorTypes.endAddrsCoarseOffset] * 32768;
 		const loopStartOffset = voice.modulatedGenerators[GeneratorTypes.startloopAddrsOffset] + voice.modulatedGenerators[GeneratorTypes.startloopAddrsCoarseOffset] * 32768;
 		const loopEndOffset = voice.modulatedGenerators[GeneratorTypes.endloopAddrsOffset] + voice.modulatedGenerators[GeneratorTypes.endloopAddrsCoarseOffset] * 32768;
-		const lastSample = cached.sampleData.length - 1;
-		voice.wavetable.cursor = clamp(cursorStartOffset, 0, lastSample);
-		voice.wavetable.end = clamp(lastSample + endOffset, 0, lastSample);
-		voice.wavetable.loopStart = clamp(cached.loopStart + loopStartOffset, 0, lastSample);
-		voice.wavetable.loopEnd = clamp(cached.loopEnd + loopEndOffset, 0, lastSample);
+		const endExclusive = cached.sampleData.length;
+		voice.wavetable.cursor = clamp(cursorStartOffset, 0, endExclusive - 1);
+		voice.wavetable.end = clamp(endExclusive + endOffset, 0, endExclusive);
+		voice.wavetable.loopStart = clamp(cached.loopStart + loopStartOffset, 0, endExclusive);
+		voice.wavetable.loopEnd = clamp(cached.loopEnd + loopEndOffset, 0, endExclusive);
 		if (voice.wavetable.loopEnd < voice.wavetable.loopStart) {
 			const temp = voice.wavetable.loopStart;
 			voice.wavetable.loopStart = voice.wavetable.loopEnd;
 			voice.wavetable.loopEnd = temp;
 		}
 		if (voice.wavetable.loopEnd - voice.wavetable.loopStart < 1 && (voice.loopingMode === 1 || voice.loopingMode === 3)) voice.loopingMode = 0;
-		voice.wavetable.loopLength = voice.wavetable.loopEnd - voice.wavetable.loopStart + 1;
+		voice.wavetable.loopLength = voice.wavetable.loopEnd - voice.wavetable.loopStart;
 		voice.wavetable.isLooping = voice.loopingMode === 1 || voice.loopingMode === 3;
 		voice.portamentoFromKey = portaFromKey;
 		voice.portamentoDuration = portaTime;
@@ -13049,8 +13059,8 @@ function applySnapshot(snapshot) {
 	this.setSystemParameter("presetLock", false);
 	if (snapshot.patch) this.setPatch(snapshot.patch);
 	this.lockedSystem = snapshot.lockedSystem;
-	for (const [parameter, value] of Object.entries(this._midiParameters)) this.setMIDIParameter(parameter, value);
-	for (const [parameter, value] of Object.entries(this._systemParameters)) this.setSystemParameter(parameter, value);
+	for (const [parameter, value] of Object.entries(snapshot.midiParameters)) this.setMIDIParameter(parameter, value);
+	for (const [parameter, value] of Object.entries(snapshot.systemParameters)) this.setSystemParameter(parameter, value);
 }
 //#endregion
 //#region src/synthesizer/audio_engine/channel/parameters/midi.ts