Make SVZ reading / writing more generic, not relying on specific chun…

…k order and layout.
sagamusix · Jan 4, 2024 · d3716f4 · d3716f4
1 parent 6e81876
commit d3716f4
Show file tree

Hide file tree

Showing 17 changed files with 283 additions and 165 deletions.
diff --git a/JDTools/Convert800to990.cpp b/JDTools/Convert800to990.cpp
@@ -1,5 +1,5 @@
 // JDTools - Patch conversion utility for Roland JD-800 / JD-990
-// 2022 by Johannes Schultz
+// 2022 - 2024 by Johannes Schultz
 // License: BSD 3-clause
 
 #include "JD-800.hpp"

diff --git a/JDTools/Convert800toVST.cpp b/JDTools/Convert800toVST.cpp
@@ -1,5 +1,5 @@
 // JDTools - Patch conversion utility for Roland JD-800 / JD-990
-// 2022 by Johannes Schultz
+// 2022 - 2024 by Johannes Schultz
 // License: BSD 3-clause
 
 #include "JD-800.hpp"

diff --git a/JDTools/Convert990to800.cpp b/JDTools/Convert990to800.cpp
@@ -1,5 +1,5 @@
 // JDTools - Patch conversion utility for Roland JD-800 / JD-990
-// 2022 by Johannes Schultz
+// 2022 - 2024 by Johannes Schultz
 // License: BSD 3-clause
 
 #include "JD-800.hpp"

diff --git a/JDTools/ConvertVSTto800.cpp b/JDTools/ConvertVSTto800.cpp
@@ -1,5 +1,5 @@
 // JDTools - Patch conversion utility for Roland JD-800 / JD-990
-// 2022 by Johannes Schultz
+// 2022 - 2024 by Johannes Schultz
 // License: BSD 3-clause
 
 #include "JD-800.hpp"

diff --git a/JDTools/InputFile.cpp b/JDTools/InputFile.cpp
@@ -1,5 +1,5 @@
 // JDTools - Patch conversion utility for Roland JD-800 / JD-990
-// 2022 by Johannes Schultz
+// 2022 - 2024 by Johannes Schultz
 // License: BSD 3-clause
 
 #include "InputFile.hpp"
@@ -17,13 +17,25 @@ InputFile::InputFile(std::istream &file)
 	}
 	else if (CompareMagic(magic, "SVZa"))
 	{
+		uint8_t numChunks = 0;
+		Read(m_file, numChunks);
 		m_file.seekg(16);
-		std::array<char, 4> type{};
-		Read(m_file, type);
-		if (CompareMagic(type, "EXTa"))
-			m_type = Type::SVZplugin;
-		else if (CompareMagic(type, "DIFa"))
-			m_type = Type::SVZhardware;
+		for (uint32_t chunk = 0; chunk < numChunks; chunk++)
+		{
+			std::array<char, 4> type{};
+			Read(m_file, type);
+			if (CompareMagic(type, "EXTa"))
+			{
+				m_type = Type::SVZplugin;
+				break;
+			}
+			else if (CompareMagic(type, "MDLa"))
+			{
+				m_type = Type::SVZhardware;
+				break;
+			}
+			m_file.seekg(12, std::ios::cur);
+		}
 	}
 	else if (magic[2] == 'S' && magic[3] == 'V')
 	{

diff --git a/JDTools/InputFile.hpp b/JDTools/InputFile.hpp
@@ -1,5 +1,5 @@
 // JDTools - Patch conversion utility for Roland JD-800 / JD-990
-// 2022 by Johannes Schultz
+// 2022 - 2024 by Johannes Schultz
 // License: BSD 3-clause
 
 #pragma once
@@ -20,7 +20,7 @@ class InputFile
 		SVD,
 	};
 
-	InputFile(std::istream& file);
+	InputFile(std::istream &file);
 
 	std::vector<uint8_t> NextSysExMessage();
 

diff --git a/JDTools/JD-08.hpp b/JDTools/JD-08.hpp
@@ -1,5 +1,5 @@
 // JDTools - Patch conversion utility for Roland JD-800 / JD-990
-// 2022 by Johannes Schultz
+// 2022 - 2024 by Johannes Schultz
 // License: BSD 3-clause
 
 #pragma once

diff --git a/JDTools/JD-800.hpp b/JDTools/JD-800.hpp
@@ -1,5 +1,5 @@
 // JDTools - Patch conversion utility for Roland JD-800 / JD-990
-// 2022 by Johannes Schultz
+// 2022 - 2024 by Johannes Schultz
 // License: BSD 3-clause
 
 #pragma once

diff --git a/JDTools/JD-990.hpp b/JDTools/JD-990.hpp
@@ -1,5 +1,5 @@
 // JDTools - Patch conversion utility for Roland JD-800 / JD-990
-// 2022 by Johannes Schultz
+// 2022 - 2024 by Johannes Schultz
 // License: BSD 3-clause
 
 #pragma once

diff --git a/JDTools/JDTools.cpp b/JDTools/JDTools.cpp
@@ -1,5 +1,5 @@
 // JDTools - Patch conversion utility for Roland JD-800 / JD-990
-// 2022 by Johannes Schultz
+// 2022 - 2024 by Johannes Schultz
 // License: BSD 3-clause
 
 #include "JDTools.hpp"
@@ -246,14 +246,14 @@ int main(const int argc, char *argv[])
 		InputFile inputFile{inFile};
 		if (inputFile.GetType() == InputFile::Type::SVZplugin)
 		{
-			vstPatches = ReadSVZforPlugin(inFile);
+			vstPatches = ReadSVZ(inFile);
 			if (vstPatches.empty())
 				return 2;
 			sourceDeviceType = DeviceType::JD800VST;
 		}
 		else if (inputFile.GetType() == InputFile::Type::SVZhardware)
 		{
-			vstPatches = ReadSVZforHardware(inFile);
+			vstPatches = ReadSVZ(inFile);
 			if (vstPatches.empty())
 				return 2;
 			sourceDeviceType = DeviceType::JD800VST;
@@ -488,7 +488,7 @@ int main(const int argc, char *argv[])
 					if (pVST.zenHeader.modelID1 != 3 || pVST.zenHeader.modelID2 != 5)
 					{
 						std::cerr << "Ignoring patch" << GetPatchIndex(sourcePatch, numPatches) << ", appears to be for another synth model!" << std::endl;
-						memset(&pVST, 0, sizeof(pVST));
+						Reconstruct(pVST);
 						pVST.zenHeader = PatchVST::DEFAULT_ZEN_HEADER;
 						pVST.name.fill(' ');
 					}

diff --git a/JDTools/JDTools.hpp b/JDTools/JDTools.hpp
@@ -1,5 +1,5 @@
 // JDTools - Patch conversion utility for Roland JD-800 / JD-990
-// 2022 by Johannes Schultz
+// 2022 - 2024 by Johannes Schultz
 // License: BSD 3-clause
 
 #pragma once

diff --git a/JDTools/JDTools.rc b/JDTools/JDTools.rc
@@ -75,10 +75,10 @@ BEGIN
         BLOCK "040004b0"
         BEGIN
             VALUE "CompanyName", "Johannes Schultz"
-            VALUE "FileDescription", "JDTools - Patch conversion utility for Roland JD-800 / JD-990"
+            VALUE "FileDescription", "JDTools - Patch conversion utility for Roland JD-800 / JD-990 and compatibles"
             VALUE "FileVersion", VER_FILEVERSION_STR
             VALUE "InternalName", "JDTools.exe"
-            VALUE "LegalCopyright", "Copyright (C) 2022 Johannes Schultz"
+            VALUE "LegalCopyright", "Copyright (C) 2022 - 2004 Johannes Schultz"
             VALUE "OriginalFilename", "JDTools.exe"
             VALUE "ProductName", "JDTools"
             VALUE "ProductVersion", VER_FILEVERSION_STR

diff --git a/JDTools/PrecomputedTablesVST.hpp b/JDTools/PrecomputedTablesVST.hpp
@@ -1,5 +1,5 @@
 // JDTools - Patch conversion utility for Roland JD-800 / JD-990
-// 2022 by Johannes Schultz
+// 2022 - 2024 by Johannes Schultz
 // License: BSD 3-clause
 
 #include <cstdint>