spessasynth_core 4.3.14 → 4.3.16

package/dist/index.d.ts

@@ -95,6 +95,19 @@ declare class SpessaLog {
    * If grouping of the log messages is allowed. Recommended for the `info` verbosity level.
    */
   static groupEnabled: boolean;
+  /**
+   * The log functions that get called with the data.
+   * By default, they use `console` object.
+   *
+   * This may be overridden to capture the spessasynth log data.
+   */
+  static logFunctions: {
+    info: (...data: any[]) => void;
+    warn: (...data: any[]) => void;
+    group: (...data: any[]) => void;
+    groupEnd: () => void;
+    groupCollapsed: (...data: any[]) => void;
+  };
   /**
    * Enables or disables logging.
    * @param enableInfo enables info.

package/dist/index.js

@@ -247,6 +247,18 @@ function writeVariableLengthQuantity(number) {
 * Other.ts
 * purpose: contains some useful functions that don't belong in any specific category
 */
+function splitmix32(a) {
+	return function() {
+		a |= 0;
+		a = a + 2654435769 | 0;
+		let t = a ^ a >>> 16;
+		t = Math.imul(t, 569420461);
+		t = t ^ t >>> 15;
+		t = Math.imul(t, 1935289751);
+		return ((t ^ t >>> 15) >>> 0) / 4294967296;
+	};
+}
+const randomGenerator = splitmix32(81572);
 /**
 * Formats the given seconds to nice readable time
 * @param totalSeconds time in seconds
@@ -879,6 +891,19 @@ var SpessaLog = class SpessaLog {
 	*/
 	static groupEnabled = false;
 	/**
+	* The log functions that get called with the data.
+	* By default, they use `console` object.
+	*
+	* This may be overridden to capture the spessasynth log data.
+	*/
+	static logFunctions = {
+		info: console.info.bind(console),
+		warn: console.warn.bind(console),
+		group: console.group.bind(console),
+		groupEnd: console.groupEnd.bind(console),
+		groupCollapsed: console.groupCollapsed.bind(console)
+	};
+	/**
 	* Enables or disables logging.
 	* @param enableInfo enables info.
 	* @param enableWarn enables warning.
@@ -890,19 +915,19 @@ var SpessaLog = class SpessaLog {
 		this.groupEnabled = enableGroup;
 	}
 	static info(...message) {
-		if (this.infoEnabled) console.info(...message);
+		if (this.infoEnabled) this.logFunctions.info(...message);
 	}
 	static warn(...message) {
-		if (this.warnEnabled) console.warn(...message);
+		if (this.warnEnabled) this.logFunctions.warn(...message);
 	}
 	static group(...message) {
-		if (this.groupEnabled) console.group(...message);
+		if (this.groupEnabled) this.logFunctions.group(...message);
 	}
 	static groupCollapsed(...message) {
-		if (this.groupEnabled) console.groupCollapsed(...message);
+		if (this.groupEnabled) this.logFunctions.groupCollapsed(...message);
 	}
 	static groupEnd() {
-		if (this.groupEnabled) console.groupEnd();
+		if (this.groupEnabled) this.logFunctions.groupEnd();
 	}
 	/**
 	* @internal
@@ -2116,12 +2141,19 @@ var MIDIUtils = class MIDIUtils {
 					controller: MIDIControllers.mainVolume,
 					value: data
 				};
-				case 14: return {
-					type: "Controller Change",
-					channel,
-					controller: MIDIControllers.pan,
-					value: data
-				};
+				case 14:
+					if (data === 0) return {
+						type: "Channel MIDI Param",
+						channel,
+						parameter: "randomPan",
+						value: true
+					};
+					return {
+						type: "Controller Change",
+						channel,
+						controller: MIDIControllers.pan,
+						value: data
+					};
 				case 18: return {
 					type: "Controller Change",
 					channel,
@@ -2291,12 +2323,19 @@ var MIDIUtils = class MIDIUtils {
 					parameter: "velocitySenseOffset",
 					value: data
 				};
-				case 28: return {
-					type: "Controller Change",
-					channel,
-					controller: MIDIControllers.pan,
-					value: data
-				};
+				case 28:
+					if (data === 0) return {
+						type: "Channel MIDI Param",
+						channel,
+						parameter: "randomPan",
+						value: true
+					};
+					return {
+						type: "Controller Change",
+						channel,
+						controller: MIDIControllers.pan,
+						value: data
+					};
 				case 31: return {
 					type: "Channel MIDI Param",
 					channel,
@@ -6457,9 +6496,11 @@ function applySnapshot$1(snapshot) {
 	const is = snapshot.insertionProcessor;
 	this.systemExclusive(MIDIUtils.gs(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.gs(64, 3, 3 + i, [is.params[i]]));
+	for (const parameter of Object.keys(snapshot.lockedMIDIParameters)) this.lockMIDIParameter(parameter, false);
 	for (const [parameter, value] of Object.entries(snapshot.midiParameters)) this.setMIDIParameter(parameter, value);
 	for (const [parameter, isLocked] of Object.entries(snapshot.lockedMIDIParameters)) this.lockMIDIParameter(parameter, isLocked);
 	for (const [parameter, value] of Object.entries(snapshot.systemParameters)) this.setSystemParameter(parameter, value);
+	this.updateActiveEffects();
 }
 function getSynthesizerSnapshot() {
 	return {
@@ -10484,6 +10525,9 @@ var ConnectionBlock = class ConnectionBlock {
 			default:
 				SpessaLog.info(`%cFailed converting DLS articulator into SF generator: %c${this.toString()}%c\n(invalid destination)`, ConsoleColors.warn, ConsoleColors.value, ConsoleColors.unrecognized);
 				return;
+			case DLSDestinations.keyNum:
+				zone.setGenerator(GeneratorTypes.keyNum, value);
+				break;
 			case DLSDestinations.pan:
 				zone.setGenerator(GeneratorTypes.pan, value);
 				break;
@@ -10633,7 +10677,7 @@ var ConnectionBlock = class ConnectionBlock {
 				newAmount: -amount
 			};
 			case DLSDestinations.pitch: return GeneratorTypes.fineTune;
-			case DLSDestinations.keyNum: return GeneratorTypes.overridingRootKey;
+			case DLSDestinations.keyNum: return GeneratorTypes.keyNum;
 			case DLSDestinations.volEnvDelay: return GeneratorTypes.delayVolEnv;
 			case DLSDestinations.volEnvAttack: return GeneratorTypes.attackVolEnv;
 			case DLSDestinations.volEnvHold: return GeneratorTypes.holdVolEnv;
@@ -10744,7 +10788,7 @@ var DownloadableSoundsArticulation = class extends DLSVerifier {
 		writeDword(art2Data, this.connectionBlocks.length);
 		const out = this.connectionBlocks.map((a) => a.write());
 		const art2 = RIFFChunk.getParts(this.mode === "dls2" ? "art2" : "art1", [art2Data, ...out]);
-		return RIFFChunk.getParts(this.mode === "dls2" ? "lar2" : "lart", art2, true);
+		return RIFFChunk.getParts(this.mode === "dls2" ? "lar2" : "lart", art2, false, true);
 	}
 	/**
 	* Converts DLS articulation into an SF zone.
@@ -11247,16 +11291,18 @@ var DownloadableSounds = class DownloadableSounds extends DLSVerifier {
 			const drumAliases = pgalData.slice(pgalData.currentIndex, pgalData.currentIndex + 128);
 			pgalData.currentIndex += 128;
 			for (let keyNum = 0; keyNum < 128; keyNum++) {
-				const alias = drumAliases[keyNum];
-				if (alias === keyNum) continue;
-				const region = drumInstrument.regions.find((r) => r.keyRange.max === alias && r.keyRange.min === alias);
+				const source = drumAliases[keyNum];
+				if (source === keyNum) continue;
+				const region = drumInstrument.regions.find((r) => r.keyRange.max === source && r.keyRange.min === source);
 				if (!region) {
-					SpessaLog.warn(`Invalid drum alias ${keyNum} to ${alias}: region does not exist.`);
+					SpessaLog.warn(`Invalid drum alias ${keyNum} to ${source}: region does not exist.`);
 					continue;
 				}
 				const copied = DownloadableSoundsRegion.copyFrom(region);
 				copied.keyRange.max = keyNum;
 				copied.keyRange.min = keyNum;
+				const fixedKeyBlock = new ConnectionBlock(new ConnectionSource(DLSSources.none, 0, false, false), new ConnectionSource(DLSSources.none, 0, false, false), DLSDestinations.keyNum, 0, source << 16);
+				copied.articulation.connectionBlocks.push(fixedKeyBlock);
 				drumInstrument.regions.push(copied);
 			}
 			pgalData.currentIndex += 4;
@@ -12632,7 +12678,7 @@ function controllerChange(controller, value, sendEvent = true) {
 			this.setBankLSB(value);
 			break;
 		case MIDIControllers.variationDepth:
-			this.synthCore.delayActive = true;
+			this.synthCore.updateActiveEffects();
 			break;
 		case MIDIControllers.registeredParameterLSB:
 		case MIDIControllers.registeredParameterMSB:
@@ -13149,12 +13195,12 @@ function noteOn(midiNote, velocity, emit = true) {
 	let reverbSend = 1;
 	let chorusSend = 1;
 	let delaySend = 1;
-	if (this._midiParameters.randomPan) panOverride = Math.round(Math.random() * 1e3 - 500);
+	if (this._midiParameters.randomPan) panOverride = Math.round(randomGenerator() * 1e3 - 500);
 	if (this._drumChannel) {
 		const p = this.drumParams[midiNote];
 		if (!p.rxNoteOn) return;
 		const drumPan = p.pan - 64;
-		if (drumPan !== 0) if (drumPan === -64) panOverride = Math.round(Math.random() * 1e3 - 500);
+		if (drumPan !== 0) if (drumPan === -64) panOverride = Math.round(randomGenerator() * 1e3 - 500);
 		else {
 			const channelPan = (this._midiControllers[MIDIControllers.pan] >> 7) - 64;
 			panOverride = Math.max(-63, Math.min(drumPan + channelPan, 63)) / 63 * 500 || 1;
@@ -13602,6 +13648,7 @@ function applySnapshot(snapshot) {
 	this.setSystemParameter("presetLock", false);
 	if (snapshot.patch) this.setPatch(snapshot.patch);
 	this.lockedSystem = snapshot.lockedSystem;
+	for (const parameter of Object.keys(snapshot.lockedMIDIParameters)) this.lockMIDIParameter(parameter, false);
 	for (const [parameter, value] of Object.entries(snapshot.midiParameters)) this.setMIDIParameter(parameter, value);
 	for (const [parameter, isLocked] of Object.entries(snapshot.lockedMIDIParameters)) this.lockMIDIParameter(parameter, isLocked);
 	for (const [parameter, value] of Object.entries(snapshot.systemParameters)) this.setSystemParameter(parameter, value);
@@ -14690,7 +14737,6 @@ function rolandSystemExclusive(syx, channelOffset = 0) {
 					if (isReverb && this.systemParameters.reverbLock) return;
 					if (isChorus && this.systemParameters.chorusLock) return;
 					if (isDelay && this.systemParameters.delayLock) return;
-					this.delayActive ||= a3 === 64 || isDelay;
 					switch (a3) {
 						default:
 							SpessaLog.gsFail("Patch Common Parameter", [a3]);
@@ -14829,6 +14875,7 @@ function rolandSystemExclusive(syx, channelOffset = 0) {
 							break;
 						case 64:
 							this.chorusProcessor.sendLevelToDelay = data;
+							this.updateActiveEffects();
 							SpessaLog.gsInfo("Chorus Send Level To Delay", data);
 							this.callEvent("effectChange", {
 								effect: "chorus",
@@ -14989,7 +15036,7 @@ function rolandSystemExclusive(syx, channelOffset = 0) {
 							return;
 						case 25:
 							this.insertionProcessor.sendLevelToDelay = data / 127 * EFX_SENDS_GAIN_CORRECTION;
-							this.delayActive = true;
+							this.updateActiveEffects();
 							SpessaLog.gsInfo("EFX Send Level to Delay", data);
 							this.callEvent("effectChange", {
 								effect: "insertion",
@@ -15168,8 +15215,8 @@ function rolandSystemExclusive(syx, channelOffset = 0) {
 						case 34: {
 							const efx = data === 1;
 							ch.setMIDIParameter("efxAssign", efx);
-							this.insertionActive ||= efx;
 							SpessaLog.gsInfo(`EFX assign for ${channel}`, efx ? "EFX" : "BYPASS");
+							this.updateActiveEffects();
 						}
 					}
 					return;
@@ -20296,7 +20343,7 @@ var SynthesizerCore = class {
 		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);
+		this.updateActiveEffects();
 	}
 	process(left, right, startIndex = 0, sampleCount = 0) {
 		this.processSplit([[left, right]], left, right, startIndex, sampleCount);
@@ -20417,6 +20464,14 @@ var SynthesizerCore = class {
 	callEvent(eventName, eventData) {
 		this.eventCallbackHandler(eventName, eventData);
 	}
+	/**
+	* @internal
+	* Checks if we can disable insertion and delay effects.
+	*/
+	updateActiveEffects() {
+		if (!this.systemParameters.insertionEffectLock) this.insertionActive = this.midiChannels.some((c) => c.midiParameters.efxAssign);
+		if (!this.systemParameters.delayLock) this.delayActive = this.midiParameters.system === "xg" ? false : this.chorusProcessor.sendLevelToDelay > 0 || this.insertionProcessor.sendLevelToDelay > 0 || this.midiChannels.some((c) => c.midiControllers[MIDIControllers.variationDepth] > 0);
+	}
 	getInsertionSnapshot() {
 		return {
 			type: this.insertionProcessor.type,
@@ -20431,7 +20486,6 @@ var SynthesizerCore = class {
 	}
 	resetInsertion() {
 		if (this.systemParameters.insertionEffectLock) return;
-		this.insertionActive = false;
 		this.insertionProcessor = this.insertionFallback;
 		this.insertionProcessor.reset();
 		this.resetInsertionParams();