Add new command line option "list-verbose" which prints out all patch…

… and special setup parameter names.

Closes #17

CMakeLists.txt

@@ -15,8 +15,10 @@ add_executable(JDTools
 	JDTools/JD-990.hpp
 	JDTools/JDTools.hpp
 	JDTools/PrecomputedTablesVST.hpp
+	JDTools/PrintPatchData.cpp
 	JDTools/SVZ.hpp
 	JDTools/Utils.hpp
+	JDTools/WaveformNames.hpp
 	JDTools/miniz.c
 	JDTools/miniz.h
 	JDTools/resource.h)

JDTools/Convert800to990.cpp

@@ -305,7 +305,7 @@ void ConvertSetup800To990(const SpecialSetup800 &s800, SpecialSetup990 &s990)
 
 	s990.effect.reverbType = 4;
 	s990.effect.reverbPreDelay = 0;
-	s990.effect.reveryEarlyRefLevel = 8;
+	s990.effect.reverbEarlyRefLevel = 8;
 	s990.effect.reverbHFDamp = 13;
 	s990.effect.reverbTime = 44;
 	s990.effect.reverbLevel = 40;

JDTools/ConvertVSTto800.cpp

@@ -33,7 +33,7 @@ static bool MapToArrayIndex(const T value, const T (&values)[N], uint8_t &target
 static double IndexToNoteDuration(const uint8_t index)
 {
 	static constexpr uint8_t Divisor[] = { 64, 64, 32, 32, 16, 32, 16, 8, 16, 8, 4, 8, 4, 2, 4, 2, 1, 2, 1, 1, 1, 1, 1 };
-	static constexpr uint8_t NoteType[] = { 3, 1, 3, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 1 };
+	static constexpr uint8_t NoteType[] = { 3, 1,   3,  1,  3,  2,  1, 3,  2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 3, 2, 1, 1 };
 	double length = 1.0;
 	if(index == 19 || index == 21)
 		length = 2.0;

JDTools/JD-08.hpp

@@ -334,9 +334,12 @@ struct ToneVST
 			filterMode,
 			cutoffFreq,
 			resonance,
-			keyFollow,
-			aTouchSens,  // +50
-			lfoSelect,
+			keyFollow;
+		int8_t
+			aTouchSens;  // +50
+		uint8_t
+			lfoSelect;
+		int8_t
 			lfoDepth,  // +50
 			envDepth;  // +50
 	};
@@ -362,20 +365,26 @@ struct ToneVST
 	{
 		uint8_t
 			biasDirection,
-			biasPoint,
-			biasLevel,  // +10
-			level,
-			aTouchSens,  // +50
-			lfoSelect,
+			biasPoint;
+		int8_t
+			biasLevel;  // +10
+		uint8_t
+			level;
+		int8_t
+			aTouchSens;  // +50
+		uint8_t
+			lfoSelect;
+		int8_t
 			lfoDepth;  // +50
 	};
 
 	struct TVAEnv
 	{
-		uint8_t
+		int8_t
 			velo,      // +50
 			timeVelo,  // +50
-			timeKF,    // +10
+			timeKF;    // +10
+		uint8_t
 			level1,
 			level2,
 			sustainLevel,

JDTools/JD-800.hpp

@@ -126,6 +126,18 @@ struct Tone800
 	TVAEnv tvaEnv;
 };
 
+struct EQ800
+{
+	uint8_t
+		lowFreq,
+		lowGain,
+		midFreq,
+		midQ,
+		midGain,
+		highFreq,
+		highGain;
+};
+
 struct Patch800
 {
 	struct Common
@@ -153,18 +165,6 @@ struct Patch800
 			activeTone;
 	};
 
-	struct EQ
-	{
-		uint8_t
-			lowFreq,
-			lowGain,
-			midFreq,
-			midQ,
-			midGain,
-			highFreq,
-			highGain;
-	};
-
 	struct MidiTx
 	{
 		uint8_t
@@ -237,7 +237,7 @@ struct Patch800
 	};
 
 	Common common;
-	EQ eq;
+	EQ800 eq;
 	MidiTx midiTx;
 	Effect effect;
 	Tone800 toneA;
@@ -248,18 +248,6 @@ struct Patch800
 
 struct SpecialSetup800
 {
-	struct EQ
-	{
-		uint8_t
-			lowFreq,
-			lowGain,
-			midFreq,
-			midQ,
-			midGain,
-			highFreq,
-			highGain;
-	};
-
 	struct Common
 	{
 		uint8_t
@@ -281,7 +269,7 @@ struct SpecialSetup800
 		Tone800 tone;
 	};
 
-	EQ eq;
+	EQ800 eq;
 	Common common;
 	std::array<Key, 61> keys;
 };

JDTools/JD-990.hpp

@@ -143,6 +143,18 @@ struct Tone990
 	ControlSource cs2;
 };
 
+struct EQ990
+{
+	uint8_t
+		lowFreq,
+		lowGain,
+		midFreq,
+		midQ,
+		midGain,
+		highFreq,
+		highGain;
+};
+
 struct Patch990
 {
 	struct Common
@@ -173,18 +185,6 @@ struct Patch990
 			soloSyncMaster;  // 990 only
 	};
 
-	struct EQ
-	{
-		uint8_t
-			lowFreq,
-			lowGain,
-			midFreq,
-			midQ,
-			midGain,
-			highFreq,
-			highGain;
-	};
-
 	struct StructureType
 	{
 		uint8_t
@@ -294,7 +294,7 @@ struct Patch990
 
 	Common common;
 	KeyEffects keyEffects;
-	EQ eq;
+	EQ990 eq;
 	StructureType structureType;
 	KeyRanges keyRanges;
 	Velocity velocity;  // 990 only
@@ -322,18 +322,6 @@ struct SpecialSetup990
 			toneControlSource2;
 	};
 
-	struct EQ
-	{
-		uint8_t
-			lowFreq,
-			lowGain,
-			midFreq,
-			midQ,
-			midGain,
-			highFreq,
-			highGain;
-	};
-
 	struct Effect
 	{
 		uint8_t
@@ -364,7 +352,7 @@ struct SpecialSetup990
 
 			reverbType,
 			reverbPreDelay,
-			reveryEarlyRefLevel,
+			reverbEarlyRefLevel,
 			reverbHFDamp,
 			reverbTime,
 			reverbLevel;
@@ -382,7 +370,7 @@ struct SpecialSetup990
 	};
 
 	Common common;
-	EQ eq;
+	EQ990 eq;
 	Effect effect;
 	std::array<Key, 61> keys;
 };

JDTools/JDTools.cpp

@@ -74,12 +74,6 @@ namespace
 	};
 }
 
-template<size_t Size>
-static std::string_view ToString(const std::array<char, Size> &arr)
-{
-	return std::string_view{ arr.data(), arr.size() };
-}
-
 static void PrintUsage()
 {
 	std::cout <<
@@ -117,7 +111,10 @@ JDTools merge <input1.syx> <input2.syx> <input3.syx> ... <output.syx>
 JDTools list <input.syx>
   Lists all SysEx / BIN / SVD / SVZ contents
 
-JDTools verify <input.syx>
+JDTools list-verbose <input.syx>
+  Lists all SysEx / BIN / SVD / SVZ contents, including all patch or special setup parameters
+
+JDTools verify <input1.syx> <input2.syx> <input3.syx> ...
   Verifies checksum of SySex dumps without doing any conversion
 )" << std::endl;
 }
@@ -208,17 +205,21 @@ int main(const int argc, char *argv[])
 	int numInputFiles = 1, firstFileParam = 2;
 	bool verifyOnly = (verb == "verify"), verifyFailed = false;
 	int numVerifiedSysExMessages = 0;
-	if (verb != "convert" && verb != "list" && verb != "verify" && verb != "merge")
+	if (verb != "convert" && verb != "list" && verb != "list-verbose" && verb != "verify" && verb != "merge")
 	{
 		PrintUsage();
 		return 1;
 	}
-	if ((verb == "list" && argc != 3) || (verb == "verify" && argc != 3) || (verb == "merge" && argc < 4))
+	if ((verb == "list" && argc != 3) || (verb == "list-verbose" && argc != 3) || (verb == "verify" && argc < 3) || (verb == "merge" && argc < 4))
 	{
 		PrintUsage();
 		return 1;
 	}
-	if (verb == "merge")
+	if (verb == "verify")
+	{
+		numInputFiles = argc - 2;
+	}
+	else if (verb == "merge")
 	{
 		numInputFiles = argc - 3;
 	}
@@ -300,6 +301,11 @@ int main(const int argc, char *argv[])
 		}
 		else
 		{
+			if (verifyOnly)
+			{
+				std::cout << "Verifying " << inFilename << "..." << std::endl;
+			}
+
 			do
 			{
 				message = inputFile.NextSysExMessage();
@@ -415,7 +421,6 @@ int main(const int argc, char *argv[])
 	{
 		if (verifyFailed)
 		{
-
 			std::cout << "SysEx dumps contained errors!" << std::endl;
 			return 3;
 		}
@@ -765,8 +770,10 @@ int main(const int argc, char *argv[])
 		}
 
 	}
-	else if (verb == "list")
+	else if (verb == "list" || verb == "list-verbose")
 	{
+		const bool verbose = verb == "list-verbose";
+
 		if (sourceDeviceType == DeviceType::JD800)
 		{
 			std::cout << "Format: JD-800" << std::endl;
@@ -816,17 +823,23 @@ int main(const int argc, char *argv[])
 					continue;
 				const Patch800 &p800 = *reinterpret_cast<const Patch800 *>(memory.data() + address800);
 				std::cout << GetPatchIndex(patch, numPatches) << ": " << ToString(p800.common.name) << std::endl;
+				if (verbose)
+					PrintPatch(p800);
 			}
 			else if (sourceDeviceType == DeviceType::JD990)
 			{
 				if (memory[address990] == UNDEFINED_MEMORY)
 					continue;
 				const Patch990 &p990 = *reinterpret_cast<const Patch990 *>(memory.data() + address990);
 				std::cout << GetPatchIndex(patch, numPatches) << ": " << ToString(p990.common.name) << std::endl;
+				if (verbose)
+					PrintPatch(p990);
 			}
 			else if (sourceDeviceType == DeviceType::JD800VST)
 			{
 				std::cout << GetPatchIndex(patch, numPatches) << ": " << ToString(vstPatches[patch].name) << std::endl;
+				if (verbose)
+					PrintPatch(vstPatches[patch]);
 			}
 		}
 		for (uint32_t patch = 0; patch < 64; patch++)
@@ -853,11 +866,17 @@ int main(const int argc, char *argv[])
 		{
 			if (memory[BASE_ADDR_800_SETUP_INTERNAL] != UNDEFINED_MEMORY)
 			{
+				const SpecialSetup800 &s800 = *reinterpret_cast<const SpecialSetup800 *>(memory.data() + BASE_ADDR_800_SETUP_INTERNAL);
 				std::cout << "Special setup (internal): JD-800 Drum Set" << std::endl;
+				if (verbose)
+					PrintSetup(s800);
 			}
 			if (memory[BASE_ADDR_800_SETUP_TEMPORARY] != UNDEFINED_MEMORY)
 			{
+				const SpecialSetup800 &s800 = *reinterpret_cast<const SpecialSetup800 *>(memory.data() + BASE_ADDR_800_SETUP_TEMPORARY);
 				std::cout << "Special setup (temporary): JD-800 Drum Set" << std::endl;
+				if (verbose)
+					PrintSetup(s800);
 			}
 		}
 		else if (sourceDeviceType == DeviceType::JD990)
@@ -866,16 +885,22 @@ int main(const int argc, char *argv[])
 			{
 				const SpecialSetup990 &s990 = *reinterpret_cast<const SpecialSetup990 *>(memory.data() + BASE_ADDR_990_SETUP_INTERNAL);
 				std::cout << "Special setup (internal): " << ToString(s990.common.name) << std::endl;
+				if (verbose)
+					PrintSetup(s990);
 			}
 			if (memory[BASE_ADDR_990_SETUP_CARD] != UNDEFINED_MEMORY)
 			{
 				const SpecialSetup990 &s990 = *reinterpret_cast<const SpecialSetup990 *>(memory.data() + BASE_ADDR_990_SETUP_CARD);
 				std::cout << "Special setup (card): " << ToString(s990.common.name) << std::endl;
+				if (verbose)
+					PrintSetup(s990);
 			}
 			if (memory[BASE_ADDR_990_SETUP_TEMPORARY] != UNDEFINED_MEMORY)
 			{
 				const SpecialSetup990 &s990 = *reinterpret_cast<const SpecialSetup990 *>(memory.data() + BASE_ADDR_990_SETUP_TEMPORARY);
 				std::cout << "Special setup (temporary): " << ToString(s990.common.name) << std::endl;
+				if (verbose)
+					PrintSetup(s990);
 			}
 		}
 	}