spessasynth_core 4.3.12 → 4.3.14

package/dist/index.js

@@ -1800,7 +1800,7 @@ var MIDIUtils = class MIDIUtils {
 				case "gs": return [MIDIUtils.gsMessage(ticks, 64, 16 | gsChannel, 20, [value])];
 				case "xg": return [MIDIUtils.xgMessage(ticks, 8, channel, 6, [value])];
 			}
-			case "efxAssign": return [MIDIUtils.gsMessage(ticks, 64, 16 | gsChannel, 34, [value])];
+			case "efxAssign": return [MIDIUtils.gsMessage(ticks, 64, 64 | gsChannel, 34, [value ? 1 : 0])];
 			case "cc1": return [MIDIUtils.gsMessage(ticks, 64, 16 | gsChannel, 31, [value])];
 			case "cc2": return [MIDIUtils.gsMessage(ticks, 64, 16 | gsChannel, 32, [value])];
 			case "drumMap": return [MIDIUtils.gsMessage(ticks, 64, 16 | gsChannel, 21, [value])];
@@ -2428,7 +2428,9 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
 		isDrum: i % 16 === 9,
 		lastBank: void 0,
 		lastBankLSB: void 0,
-		hasBankSelect: false
+		hasBankSelect: false,
+		programChangeTrack: void 0,
+		programChangeIndex: void 0
 	});
 	mid.iterate((e, trackNum, eventIndexes) => {
 		const portOffset = mid.portChannelOffsetMap[ports[trackNum]];
@@ -2436,7 +2438,7 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
 			ports[trackNum] = e.data[0];
 			return;
 		}
-		const status = e.statusByte & 240;
+		let status = e.statusByte & 240;
 		if (status !== MIDIMessageTypes.controllerChange && status !== MIDIMessageTypes.programChange && status !== MIDIMessageTypes.systemExclusive) return;
 		if (status === MIDIMessageTypes.systemExclusive) {
 			const syx = MIDIUtils.analyzeSysEx(e.data);
@@ -2477,6 +2479,7 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
 				}
 			}
 		}
+		status = e.statusByte & 240;
 		const chNum = (e.statusByte & 15) + portOffset;
 		const ch = channels[chNum];
 		if (status === MIDIMessageTypes.programChange) {
@@ -2489,6 +2492,9 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
 			const targetPreset = soundBank.getPreset(patch, system);
 			SpessaLog.info(`%cInput patch: %c${MIDIPatchTools.toMIDIString(patch)}%c. Channel %c${chNum}%c. Changing patch to ${targetPreset.toString()}.`, ConsoleColors.info, ConsoleColors.unrecognized, ConsoleColors.info, ConsoleColors.recognized, ConsoleColors.info);
 			e.data[0] = targetPreset.program;
+			ch.program = targetPreset.program;
+			ch.programChangeTrack ??= trackNum;
+			ch.programChangeIndex ??= eventIndexes[trackNum];
 			if (targetPreset.isGMGSDrum && BankSelectHacks.isSystemXG(system)) return;
 			if (ch.lastBank === void 0) return;
 			ch.lastBank.data[1] = BankSelectHacks.addBankOffset(targetPreset.bankMSB, bankOffset, system === "xg");
@@ -2506,35 +2512,38 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
 		const ch = channels[chNum];
 		if (ch.hasBankSelect) continue;
 		const midiChannel = chNum % 16;
-		const status = MIDIMessageTypes.programChange | midiChannel;
 		const portOffset = Math.floor(chNum / 16) * 16;
 		const port = mid.portChannelOffsetMap.indexOf(portOffset);
-		const track = mid.tracks.find((t) => t.port === port && t.channels.has(midiChannel));
-		if (track === void 0) continue;
-		let indexToAdd = track.events.findIndex((e) => e.statusByte === status);
-		if (indexToAdd === -1) {
-			const programIndex = track.events.findIndex((e) => e.statusByte > 128 && e.statusByte < 240 && (e.statusByte & 15) === midiChannel);
+		const tracksUsedByChannel = mid.tracks.filter((t) => t.port === port && t.channels.has(midiChannel));
+		if (tracksUsedByChannel.length === 0) continue;
+		let foundTrack = ch.programChangeTrack ? mid.tracks[ch.programChangeTrack] : void 0;
+		let indexToAdd = ch.programChangeIndex ?? -1;
+		if (!foundTrack) {
+			const programChangeTrack = tracksUsedByChannel[0];
+			const programIndex = programChangeTrack.events.findIndex((e) => e.statusByte >= 128 && e.statusByte < 240 && (e.statusByte & 15) === midiChannel);
 			if (programIndex === -1) continue;
-			const programTicks = track.events[programIndex].ticks;
+			const programTicks = programChangeTrack.events[programIndex].ticks;
 			const targetProgram = soundBank.getPreset({
 				bankMSB: 0,
 				bankLSB: 0,
 				program: 0,
 				isGMGSDrum: false
 			}, system).program;
-			track.addEvents(programIndex, MIDIMessage.programChange(programTicks, midiChannel, targetProgram));
+			SpessaLog.info(`%cAdding default program change for %c${chNum}`, ConsoleColors.info, ConsoleColors.recognized);
+			programChangeTrack.addEvents(programIndex, MIDIMessage.programChange(programTicks, midiChannel, targetProgram));
 			indexToAdd = programIndex;
+			foundTrack = programChangeTrack;
 		}
-		SpessaLog.info(`%cAdding bank select for %c${chNum}`, ConsoleColors.info, ConsoleColors.recognized);
-		const ticks = track.events[indexToAdd].ticks;
+		const ticks = foundTrack.events[indexToAdd].ticks;
 		const targetPreset = soundBank.getPreset({
 			bankLSB: 0,
 			bankMSB: 0,
 			program: ch.program,
 			isGMGSDrum: ch.isDrum
 		}, system);
+		SpessaLog.info(`%cAdding bank select for %c${chNum}%c Targeting preset: %c${targetPreset.toString()}`, ConsoleColors.info, ConsoleColors.recognized, ConsoleColors.info, ConsoleColors.recognized);
 		const targetBank = BankSelectHacks.addBankOffset(targetPreset.bankMSB, bankOffset, system === "xg");
-		track.addEvents(indexToAdd, MIDIMessage.controllerChange(ticks, midiChannel, MIDIControllers.bankSelect, targetBank));
+		foundTrack.addEvents(indexToAdd, MIDIMessage.controllerChange(ticks, midiChannel, MIDIControllers.bankSelect, targetBank));
 	}
 	if (system === "gm" && !BankSelectHacks.isSystemXG(system)) {
 		for (const m of unwantedSystems) {
@@ -3227,7 +3236,7 @@ function modifyMIDIInternal(midi, opts) {
 			case MIDIMessageTypes.controllerChange: {
 				const ccNum = e.data[0];
 				const value = e.data[1];
-				if (channelChange?.controllers?.get(ccNum)) {
+				if (channelChange?.controllers?.get(ccNum) !== void 0) {
 					deleteThisEvent();
 					return;
 				}
@@ -3256,7 +3265,7 @@ function modifyMIDIInternal(midi, opts) {
 							case "Controller Change": {
 								const ccNum = data.controller;
 								const channel = data.channel;
-								if (channelChange?.controllers?.get(ccNum)) {
+								if (channelChange?.controllers?.get(ccNum) !== void 0) {
 									deleteParameter(channel);
 									return;
 								}
@@ -5358,8 +5367,8 @@ function setTimeToInternal(time, ticks = void 0) {
 		if (ch.portamentoNote >= 0) if (this.externalMIDIPlayback) this.sendMIDICC(channel, MIDIControllers.portamentoControl, ch.portamentoNote);
 		else this.synth.midiChannels[channel].setLastNote(ch.portamentoNote);
 		for (let i = 0; i < 128; i++) {
-			const value = ch.controllers[i] >> 7;
-			if (value !== DEFAULT_MIDI_CONTROLLERS[i] && !nonSkippableCCs.has(i)) this.sendMIDICC(channel, i, value);
+			const value = ch.controllers[i];
+			if (value !== DEFAULT_MIDI_CONTROLLERS[i] && !nonSkippableCCs.has(i)) this.sendMIDICC(channel, i, value >> 7);
 		}
 	}
 	if (savedTempo) this.callEvent("metaEvent", {
@@ -8211,9 +8220,7 @@ const defaultSpessaSynthModulators = [
 	new DecodedModulator(getModSourceEnum(ModulatorCurveTypes.linear, true, false, true, MIDIControllers.decayTime), 0, GeneratorTypes.decayVolEnv, 3600, 0),
 	new DecodedModulator(getModSourceEnum(ModulatorCurveTypes.linear, true, false, true, MIDIControllers.brightness), 0, GeneratorTypes.initialFilterFc, 9600, 0),
 	new DecodedModulator(DEFAULT_RESONANT_MOD_SOURCE, 0, GeneratorTypes.initialFilterQ, 250, 0),
-	new DecodedModulator(getModSourceEnum(ModulatorCurveTypes.switch, false, false, true, MIDIControllers.softPedal), 0, GeneratorTypes.initialAttenuation, 50, 0),
-	new DecodedModulator(getModSourceEnum(ModulatorCurveTypes.switch, false, false, true, MIDIControllers.softPedal), 0, GeneratorTypes.initialFilterFc, -2400, 0),
-	new DecodedModulator(getModSourceEnum(ModulatorCurveTypes.linear, true, false, true, MIDIControllers.balance), 0, GeneratorTypes.pan, 500, 0)
+	new DecodedModulator(getModSourceEnum(ModulatorCurveTypes.switch, false, false, true, MIDIControllers.softPedal), 0, GeneratorTypes.initialFilterFc, -1200, 0)
 ];
 const SPESSASYNTH_DEFAULT_MODULATORS = [...defaultSoundFont2Modulators, ...defaultSpessaSynthModulators];
 //#endregion
@@ -8550,6 +8557,7 @@ var BasicSample = class {
 	*/
 	setLinkedSample(sample, type) {
 		if (sample.linkedSample) throw new Error(`${sample.name} is linked tp ${sample.linkedSample.name}. Unlink it first.`);
+		if (this === sample) throw new Error(`${sample.name} cannot be linked to itself.`);
 		this.linkedSample = sample;
 		sample.linkedSample = this;
 		switch (type) {
@@ -9304,6 +9312,9 @@ var SoundFontSample = class extends BasicSample {
 		if (linked) if (linked.linkedSample) {
 			SpessaLog.info(`%cInvalid linked sample for ${this.name}: ${linked.name} is already linked to ${linked.linkedSample.name}`, ConsoleColors.warn);
 			this.unlinkSample();
+		} else if (linked === this) {
+			SpessaLog.info(`%cInvalid linked sample for ${this.name}: linked to itself.`, ConsoleColors.warn);
+			this.unlinkSample();
 		} else this.setLinkedSample(linked, this.sampleType);
 		else {
 			SpessaLog.info(`%cInvalid linked sample for ${this.name}. Setting to mono.`, ConsoleColors.warn);
@@ -20282,10 +20293,10 @@ var SynthesizerCore = class {
 		this.setReverbMacro(4);
 		this.setChorusMacro(2);
 		this.setDelayMacro(0);
-		if (!this.systemParameters.delayLock) this.delayActive = false;
 		this.resetInsertion();
 		if (!this.drumPreset || !this.defaultPreset) return;
 		for (const ch of this.midiChannels) ch.reset(false);
+		if (!this.systemParameters.delayLock) this.delayActive = this.midiChannels.some((c) => c.midiControllers[MIDIControllers.variationDepth] > 0);
 	}
 	process(left, right, startIndex = 0, sampleCount = 0) {
 		this.processSplit([[left, right]], left, right, startIndex, sampleCount);