spessasynth_core 4.3.7 → 4.3.9

package/dist/index.d.ts

@@ -1982,17 +1982,17 @@ interface ChannelMIDIParameter {
    */
   randomPan: boolean;
   /**
-   * Assign mode for the channel.
-   * `ASSIGN MODE` is the parameter that determines how voice assignment will be handled when sounds overlap on identical note numbers in the same channel (i.e., repeatedly struck notes).
-   * This is initialized to a mode suitable for each Part, so for general purposes there is no need to change this.
+   * Assign mode for the channel:
+   * - `0` - A new note will kill the previous one if it is still playing.
+   * - Any other value - A new note will not kill the previous notes (default).
    *
-   * - 0 - Single: If the same note is played multiple times in succession, the previously-sounding note will be completely silenced, and then the new note will be sounded.
-   * - 1 - LimitedMulti: If the same note is played multiple times in succession, the previously-sounding note will be continued to a certain extent even after the new note is sounded. (Default setting)
-   * - 2 - FullMulti: If the same note is played multiple times in succession, the previously-sounding note(s) will continue sounding for their natural length even after the new note is sounded.
+   * While GS and XG differentiate 1 (Limited Multi for GS/Multi for XG) and 2 (Full Multi for GS/Inst (for Drum)),
+   * SpessaSynth treats them both as full Multi. (no note killing is performed)
    *
-   * SpessaSynth treats LimitedMulti like FullMulti.
-   * Essentially Limited and Full are normal
-   * and Single is like `monophonicRetrigger` system parameter.
+   * This may be useful for emulating SC-55 hi-hat cutoff or MSGS note cutoff.
+   *
+   * Refer to [SC-8850 Owner's Manual](https://cdn.roland.com/assets/media/pdf/SC-8850_OM.pdf), page 238 for more description.
+   * Note that `SAME NOTE NUMBER KEY ON ASSIGN` in XG is also recognized as assign mode.
    */
   assignMode: number;
   /**
@@ -2217,6 +2217,8 @@ interface GlobalSystemParameter {
   /**
    * The master pan.
    * From -1 (left) to 1 (right). 0 is center.
+   *
+   * This uses the cosine panning law, so the perceived loudness remains constant as the pan changes.
    */
   pan: number;
   /**
@@ -2827,13 +2829,17 @@ interface GlobalMIDIParameter {
    */
   fineTune: number;
   /**
-   * The master gain.
-   * From 0 to any number. 1 is 100% volume.
+   * The master volume.
+   * From 0 (silent) to 1 (full volume).
+   *
+   * This differs from the `gain` system parameter in that it is squared internally.
    */
-  gain: number;
+  volume: number;
   /**
    * The master pan.
    * From -1 (left) to 1 (right). 0 is center.
+   *
+   * This uses the cosine panning law, so the perceived loudness remains constant as the pan changes.
    */
   pan: number;
 }
@@ -3389,6 +3395,14 @@ declare class BasicSoundBank {
    * Indicates if the SF3/SF2Pack decoder is ready.
    */
   static isSF3DecoderReady: Promise<boolean>;
+  /**
+   * The type of the sound bank that was loaded.
+   * Either `sf2` for SoundFont2/SoundFont3 or `dls` for DownLoadable Sounds.
+   *
+   * Please note that SF3 or SFOGG files are parsed as `sf2` files, but with compressed samples.
+   * The type is still `sf2`.
+   */
+  readonly type: "sf2" | "dls";
   /**
    * Sound bank's info.
    */
@@ -3413,6 +3427,7 @@ declare class BasicSoundBank {
    * If the sound bank has custom default modulators (DMOD).
    */
   customDefaultModulators: boolean;
+  constructor(type?: "sf2" | "dls");
   private _isXGBank;
   /**
    * Checks for XG drum sets and considers if this sound bank is XG.

package/dist/index.js

@@ -1698,9 +1698,9 @@ var MIDIUtils = class MIDIUtils {
 					])];
 				}
 			}
-			case "gain": switch (system) {
+			case "volume": switch (system) {
 				default: {
-					const gainValue = Math.floor(Math.sqrt(value) * 16383);
+					const gainValue = Math.floor(value * 16383);
 					return [MIDIUtils.deviceControlMessage(ticks, 1, [gainValue & 127, gainValue >> 7 & 127])];
 				}
 				case "xg": {
@@ -1747,7 +1747,11 @@ var MIDIUtils = class MIDIUtils {
 			case "keyShift": return MIDIMessage.registeredParameter(ticks, channel, RegisteredParameterTypes.coarseTuning, value + 64 << 7);
 			case "fineTune": return MIDIMessage.registeredParameter(ticks, channel, RegisteredParameterTypes.fineTuning, Math.floor(value * 81.92 + 8192));
 			case "randomPan": return system === "xg" ? [MIDIUtils.xgMessage(ticks, 8, channel, 14, [0])] : [MIDIUtils.gsMessage(ticks, 64, 16 | gsChannel, 28, [0])];
-			case "assignMode": return [MIDIUtils.gsMessage(ticks, 64, 16 | gsChannel, 20, [value])];
+			case "assignMode": switch (system) {
+				default:
+				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 "cc1": return [MIDIUtils.gsMessage(ticks, 64, 16 | gsChannel, 31, [value])];
 			case "cc2": return [MIDIUtils.gsMessage(ticks, 64, 16 | gsChannel, 32, [value])];
@@ -1924,7 +1928,7 @@ var MIDIUtils = class MIDIUtils {
 				const value = (syx[5] << 7 | syx[4]) / 16383;
 				return {
 					type: "Global MIDI Param",
-					parameter: "gain",
+					parameter: "volume",
 					value: Math.pow(value, 2)
 				};
 			}
@@ -1949,11 +1953,12 @@ var MIDIUtils = class MIDIUtils {
 					default: return OTHER;
 					case 1: switch (syx[9]) {
 						default: return OTHER;
-						case 1:
-						case 2: return { type: "Reverb Param" };
+						case 0:
+						case 1: return { type: "Reverb Param" };
 					}
 					case 2: switch (syx[9]) {
 						default: return OTHER;
+						case 0:
 						case 1:
 						case 2:
 						case 3:
@@ -2015,7 +2020,6 @@ var MIDIUtils = class MIDIUtils {
 		if (a1 === 3 && a2 === 0) return { type: "Variation Param" };
 		if (a1 === 8) {
 			const channel = a2;
-			if (channel >= 16) return OTHER;
 			switch (a3) {
 				default: return OTHER;
 				case 1: return {
@@ -2041,6 +2045,12 @@ var MIDIUtils = class MIDIUtils {
 					controller: data === 1 ? MIDIControllers.polyModeOn : MIDIControllers.monoModeOn,
 					value: 0
 				};
+				case 6: return {
+					type: "Channel MIDI Param",
+					channel,
+					parameter: "assignMode",
+					value: data
+				};
 				case 7: return {
 					type: "Drums On",
 					channel,
@@ -2145,7 +2155,7 @@ var MIDIUtils = class MIDIUtils {
 			};
 			case 4: return {
 				type: "Global MIDI Param",
-				parameter: "gain",
+				parameter: "volume",
 				value: data / 127
 			};
 			case 5: return {
@@ -2160,7 +2170,8 @@ var MIDIUtils = class MIDIUtils {
 			};
 			case 127:
 				switch (data) {
-					case 0: return {
+					case 0:
+					case 1: return {
 						type: "Global MIDI Param",
 						parameter: "system",
 						value: "gs"
@@ -2174,12 +2185,8 @@ var MIDIUtils = class MIDIUtils {
 				return OTHER;
 		}
 		if (a1 === 65) return { type: "Drum Setup" };
-		if (a1 !== 64) return OTHER;
-		if (a2 === 0 && a3 === 5) return {
-			type: "Global MIDI Param",
-			parameter: "keyShift",
-			value: data - 64
-		};
+		if (a1 !== 64 && a1 !== 80) return OTHER;
+		const channelOffset = a1 === 80 ? 16 : 0;
 		if (a2 === 1) {
 			if (a3 >= 48 && a3 <= 55) return { type: "Reverb Param" };
 			if (a3 >= 56 && a3 <= 64) return { type: "Chorus Param" };
@@ -2187,7 +2194,7 @@ var MIDIUtils = class MIDIUtils {
 		}
 		if (a2 === 3 && a3 >= 0 && a3 <= 127) return { type: "Insertion Param" };
 		if (a2 >> 4 === 1) {
-			const channel = MIDIUtils.syxToChannel(a2 & 15);
+			const channel = MIDIUtils.syxToChannel(a2 & 15) + channelOffset;
 			switch (a3) {
 				default: return OTHER;
 				case 0: return {
@@ -2329,7 +2336,7 @@ var MIDIUtils = class MIDIUtils {
 			}
 		}
 		if (a2 >> 4 === 4) {
-			const channel = MIDIUtils.syxToChannel(a2 & 15);
+			const channel = MIDIUtils.syxToChannel(a2 & 15) + channelOffset;
 			switch (a3) {
 				default: return OTHER;
 				case 0:
@@ -2389,6 +2396,7 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
 				default: return;
 				case "Drums On": {
 					const sysexChannel = syx.channel + portOffset;
+					if (!channels[sysexChannel]) return;
 					channels[sysexChannel].isDrum = syx.isDrum;
 					return;
 				}
@@ -2403,6 +2411,7 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
 					break;
 				case "Controller Change": {
 					const t = mid.tracks[trackNum];
+					if (syx.channel >= 16) return;
 					const newEvent = MIDIMessage.controllerChange(e.ticks, syx.channel, syx.controller, syx.value);
 					t.events[eventIndexes[trackNum]] = newEvent;
 					e = newEvent;
@@ -2410,6 +2419,7 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
 					break;
 				}
 				case "Program Change": {
+					if (syx.channel >= 16) return;
 					const t = mid.tracks[trackNum];
 					const newEvent = MIDIMessage.programChange(e.ticks, syx.channel, syx.value);
 					t.events[eventIndexes[trackNum]] = newEvent;
@@ -2838,16 +2848,19 @@ function getUsedProgramsAndKeys(mid, soundBank) {
 					case "Channel MIDI Param":
 						if (syx.parameter === "keyShift") {
 							const ch = channels[syx.channel];
+							if (!ch) break;
 							ch.keyShift = ch.isDrum ? 0 : syx.value;
 						}
 						break;
 					case "Drums On": {
 						const sysexChannel = syx.channel + channelOffset;
+						if (!channels[sysexChannel]) break;
 						channels[sysexChannel].isDrum = syx.isDrum;
 						break;
 					}
 					case "Program Change": {
 						const ch = channels[syx.channel + channelOffset];
+						if (!ch) break;
 						ch.preset = soundBank.getPreset({
 							bankMSB: ch.bankMSB,
 							bankLSB: ch.bankLSB,
@@ -2857,9 +2870,10 @@ function getUsedProgramsAndKeys(mid, soundBank) {
 						break;
 					}
 					case "Controller Change": {
-						const sysexChannel = syx.channel + channelOffset;
-						if (syx.controller === MIDIControllers.bankSelectLSB) channels[sysexChannel].bankLSB = syx.value;
-						else if (syx.controller === MIDIControllers.bankSelect) channels[sysexChannel].bankMSB = syx.value;
+						const ch = channels[syx.channel + channelOffset];
+						if (!ch) break;
+						if (syx.controller === MIDIControllers.bankSelectLSB) ch.bankLSB = syx.value;
+						else if (syx.controller === MIDIControllers.bankSelect) ch.bankMSB = syx.value;
 					}
 				}
 			}
@@ -3307,7 +3321,7 @@ function modifyMIDIInternal(midi, opts) {
 						}
 						if (syx.parameter === "fineTune") {
 							const syxStatus = channelStatuses[syx.channel + portOffset];
-							if (syxStatus.isFirstNoteOn && syxChannel) {
+							if (syxStatus && syxStatus.isFirstNoteOn && syxChannel) {
 								const newTune = syxStatus.fineTune + syx.value;
 								syxStatus.currentKeyShift = Math.trunc(newTune / 100);
 								syxStatus.fineTune = newTune % 100;
@@ -5225,6 +5239,7 @@ function setTimeToInternal(time, ticks = void 0) {
 						break;
 					case "Controller Change": {
 						const { controller, value, channel } = analyzed;
+						if (channel >= channelsToSave) break;
 						if (this._midiData.isMultiPort && track.channels.size === 0) break;
 						if (controller === MIDIControllers.resetAllControllers) {
 							resetAllControllers(channel);
@@ -11272,7 +11287,7 @@ var DownloadableSounds = class DownloadableSounds extends DLSVerifier {
 	*/
 	toSF() {
 		SpessaLog.group("%cConverting DLS to SF2...", ConsoleColors.info);
-		const soundBank = new BasicSoundBank();
+		const soundBank = new BasicSoundBank("dls");
 		soundBank.soundBankInfo.version.minor = 4;
 		soundBank.soundBankInfo.version.major = 2;
 		soundBank.soundBankInfo = { ...this.soundBankInfo };
@@ -11295,6 +11310,14 @@ var BasicSoundBank = class BasicSoundBank {
 	*/
 	static isSF3DecoderReady = stb.isInitialized;
 	/**
+	* The type of the sound bank that was loaded.
+	* Either `sf2` for SoundFont2/SoundFont3 or `dls` for DownLoadable Sounds.
+	*
+	* Please note that SF3 or SFOGG files are parsed as `sf2` files, but with compressed samples.
+	* The type is still `sf2`.
+	*/
+	type;
+	/**
 	* Sound bank's info.
 	*/
 	soundBankInfo = {
@@ -11327,6 +11350,9 @@ var BasicSoundBank = class BasicSoundBank {
 	* If the sound bank has custom default modulators (DMOD).
 	*/
 	customDefaultModulators = false;
+	constructor(type = "sf2") {
+		this.type = type;
+	}
 	_isXGBank = false;
 	/**
 	* Checks for XG drum sets and considers if this sound bank is XG.
@@ -11916,7 +11942,7 @@ var SoundFont2 = class extends BasicSoundBank {
 	* Initializes a new SoundFont2 Parser and parses the given data array
 	*/
 	constructor(arrayBuffer, warnDeprecated = true) {
-		super();
+		super("sf2");
 		if (warnDeprecated) throw new Error("Using the constructor directly is deprecated. Use SoundBankLoader.fromArrayBuffer() instead.");
 		const mainFileArray = new IndexedByteArray(arrayBuffer);
 		SpessaLog.group("%cParsing a SoundFont2 file...", ConsoleColors.info);
@@ -14021,7 +14047,7 @@ var MIDIChannel = class {
 		this.currentTuning = this._drumChannel ? channelSystem.fineTune : globalSystem.fineTune + globalMIDI.fineTune + channelSystem.fineTune + channelMIDI.fineTune;
 		const currentPanNormalized = globalSystem.pan + globalMIDI.pan + channelSystem.pan;
 		this.currentPan = currentPanNormalized * 500;
-		this.currentGain = SPESSASYNTH_GAIN_FACTOR * globalSystem.gain * globalMIDI.gain * channelSystem.gain;
+		this.currentGain = SPESSASYNTH_GAIN_FACTOR * globalSystem.gain * Math.pow(globalMIDI.volume, 2) * channelSystem.gain;
 	}
 	/**
 	* Sets the channel to a given MIDI patch.
@@ -14330,8 +14356,7 @@ function universalSystemExclusive(syx, channelOffset = 0) {
 					break;
 				case 1: {
 					const vol = syx[5] << 7 | syx[4];
-					const gain = Math.pow(vol / 16383, 2);
-					this.setMIDIParameter("gain", gain);
+					this.setMIDIParameter("volume", vol / 16383);
 					SpessaLog.gmInfo("Master Volume", vol);
 					break;
 				}
@@ -14497,12 +14522,17 @@ function rolandSystemExclusive(syx, channelOffset = 0) {
 			const a2 = syx[5];
 			const a3 = syx[6];
 			const data = Math.min(syx[7], 127);
-			if (a1 === 0 && a2 === 0 && a3 === 127 && data === 0) {
+			if (a1 === 0 && a2 === 0 && a3 === 127 && (data === 0 || data === 1)) {
+				if (data === 1) {
+					SpessaLog.gsInfo("Mode", "Double Module");
+					while (this.midiChannels.length < 32) this.createMIDIChannel(true);
+				}
 				SpessaLog.coolInfo("MIDI System", "Roland GS");
 				this.reset("gs");
 				return;
 			}
-			if (a1 === 64) {
+			if (a1 === 64 || a1 === 80) {
+				if (a1 === 80) channelOffset += 16;
 				if (a2 === 0) {
 					switch (a3) {
 						case 0: {
@@ -14513,7 +14543,7 @@ function rolandSystemExclusive(syx, channelOffset = 0) {
 						}
 						case 4:
 							SpessaLog.gsInfo("Master Volume", data);
-							this.setMIDIParameter("gain", data / 127);
+							this.setMIDIParameter("volume", data / 127);
 							break;
 						case 5: {
 							const transpose = data - 64;
@@ -14861,6 +14891,7 @@ function rolandSystemExclusive(syx, channelOffset = 0) {
 				if (a2 >> 4 === 1) {
 					const channel = MIDIUtils.syxToChannel(a2 & 15) + channelOffset;
 					const ch = this.midiChannels[channel];
+					if (!ch) SpessaLog.gsFail(`Patch Parameter for ${channel}`, syx, "Invalid channel number");
 					switch (a3) {
 						default:
 							SpessaLog.gsFail(`Patch Part Parameter for ${channel}`, [a3]);
@@ -15035,7 +15066,7 @@ function rolandSystemExclusive(syx, channelOffset = 0) {
 				SpessaLog.gsFail("Patch Parameter", syx);
 				return;
 			}
-			if (a1 === 65) {
+			if (a1 === 65 || a1 === 81) {
 				if (this.systemParameters.drumLock) return;
 				const map = (a2 >> 4) + 1;
 				const drumKey = a3;
@@ -15046,7 +15077,8 @@ function rolandSystemExclusive(syx, channelOffset = 0) {
 						return;
 					case 0: {
 						const patchName = readBinaryString(syx, 12, 7);
-						SpessaLog.gsInfo(`Patch Name for MAP${map}`, patchName);
+						SpessaLog.gsInfo(`Drum Map Name for MAP${map}`, patchName);
+						this.callEvent("displayMessage", [...syx]);
 						break;
 					}
 					case 1: {
@@ -15121,12 +15153,10 @@ function rolandSystemExclusive(syx, channelOffset = 0) {
 			return;
 		}
 		case 69:
-			if (syx[4] === 16) if (syx[5] === 0) this.callEvent("displayMessage", [...syx]);
-			else if (syx[5] === 1) this.callEvent("displayMessage", [...syx]);
-			else SpessaLog.gsFail("Display Data", syx);
+			if (syx[4] === 16) this.callEvent("displayMessage", [...syx]);
 			return;
 		case 22: if (syx[4] === 16) {
-			this.setMIDIParameter("gain", syx[7] / 100);
+			this.setMIDIParameter("volume", syx[7] / 100);
 			SpessaLog.coolInfo("Roland Master Volume Control", syx[7]);
 			return;
 		} else SpessaLog.unsupported("Roland", syx);
@@ -15160,12 +15190,12 @@ function yamahaSystemExclusive(syx, channelOffset = 0) {
 					}
 					break;
 				case 4:
-					this.setMIDIParameter("gain", data / 127);
+					this.setMIDIParameter("volume", data / 127);
 					SpessaLog.xgInfo("Master Volume", data);
 					break;
 				case 5: {
 					const vol = 127 - data;
-					this.setMIDIParameter("gain", vol / 127);
+					this.setMIDIParameter("volume", vol / 127);
 					SpessaLog.xgInfo("Master Attenuation", data);
 					break;
 				}
@@ -15225,6 +15255,10 @@ function yamahaSystemExclusive(syx, channelOffset = 0) {
 					SpessaLog.xgInfo(`Mono/poly on ${channel}`, poly ? "POLY" : "MONO");
 					break;
 				}
+				case 6:
+					ch.setMIDIParameter("assignMode", data);
+					SpessaLog.xgInfo(`Same Note Number Key On Assign on ${channel}`, data);
+					break;
 				case 7: {
 					const drums = data !== 0;
 					ch.setDrums(drums);
@@ -19740,7 +19774,7 @@ var SpessaSynthDelay = class {
 //#endregion
 //#region src/synthesizer/audio_engine/parameters/midi.ts
 const DEFAULT_GLOBAL_MIDI_PARAMETERS = {
-	gain: 1,
+	volume: 1,
 	pan: 0,
 	keyShift: 0,
 	fineTune: 0,
@@ -20138,7 +20172,7 @@ var SynthesizerCore = class {
 	reset(system = "gs") {
 		this.callEvent("reset", system);
 		this.setMIDIParameter("system", system);
-		this.setMIDIParameter("gain", 1);
+		this.setMIDIParameter("volume", 1);
 		this.setMIDIParameter("pan", 0);
 		this.setMIDIParameter("keyShift", 0);
 		this.setMIDIParameter("fineTune", 0);