spessasynth_core 4.3.13 → 4.3.15

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])];
@@ -2438,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);
@@ -2479,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) {
@@ -3235,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;
 				}
@@ -3264,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;
 								}
@@ -5366,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", {
@@ -10483,6 +10484,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;
@@ -10632,7 +10636,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;
@@ -10743,7 +10747,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.
@@ -11246,16 +11250,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;
@@ -20292,10 +20298,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);