enable reading of zipped GUS patch sets directly without client side support.

Just pass the zip's name for the patch set and it will work automatically.
This also deletes a redundant copy of miniz.h in libxmp.

Author: coelckers

CMakeLists.txt

@@ -4,6 +4,10 @@ set(CMAKE_C_VISIBILITY_PRESET hidden)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF) 
+
 if (VCPKG_LIBSNDFILE)
 	list(APPEND VCPKG_MANIFEST_FEATURES "vcpkg-libsndfile")
 endif()

source/CMakeLists.txt

@@ -38,6 +38,8 @@ INTERFACE
 	zmusic/configuration.cpp
 	zmusic/zmusic.cpp
 	zmusic/critsec.cpp
+	zmusic/file_zip.cpp
+	
 	loader/test.c
 )
 

source/mididevices/music_timidity_mididevice.cpp

@@ -272,6 +272,15 @@ bool GUS_SetupConfig(const char* args)
 			// If the passed file is an SF2 sound font we need to use the special reader that fakes a config for it.
 			if (memcmp(test, "RIFF", 4) == 0 && memcmp(test + 8, "sfbk", 4) == 0)
 				reader = new MusicIO::SF2Reader(args);
+			// Also try zipped GUS patch sets.
+			else if (memcmp(test, "PK\3\4", 4) == 0)
+			{
+				auto zreader = new MusicIO::ZipPatReader(args);
+				if (zreader->isValid())	// must check if it worked.
+					reader = zreader;
+				else
+					delete zreader;
+			}
 		}
 		if (!reader) reader = new MusicIO::FileSystemSoundFontReader(args, true);
 	}

source/mididevices/music_timiditypp_mididevice.cpp

@@ -214,6 +214,15 @@ bool Timidity_SetupConfig(const char* args)
 			// If the passed file is an SF2 sound font we need to use the special reader that fakes a config for it.
 			if (memcmp(test, "RIFF", 4) == 0 && memcmp(test + 8, "sfbk", 4) == 0)
 				reader = new MusicIO::SF2Reader(args);
+			// Also try zipped GUS patch sets.
+			else if (memcmp(test, "PK\3\4", 4) == 0)
+			{
+				auto zreader = new MusicIO::ZipPatReader(args);
+				if (zreader->isValid())	// must check if it worked.
+					reader = zreader;
+				else
+					delete zreader;
+			}
 		}
 		if (!reader) reader = new MusicIO::FileSystemSoundFontReader(args, true);
 	}

source/mididevices/music_wildmidi_mididevice.cpp

@@ -246,7 +246,24 @@ bool WildMidi_SetupConfig(const char* args)
 	MusicIO::SoundFontReaderInterface* reader = MusicIO::ClientOpenSoundFont(args, SF_GUS);
 	if (!reader && MusicIO::fileExists(args))
 	{
-		reader = new MusicIO::FileSystemSoundFontReader(args, true);
+		auto f = MusicIO::utf8_fopen(args, "rb");
+		if (f)
+		{
+			char test[12] = {};
+			fread(test, 1, 12, f);
+			fclose(f);
+			// Also try zipped GUS patch sets.
+			if (memcmp(test, "PK\3\4", 4) == 0)
+			{
+				auto zreader = new MusicIO::ZipPatReader(args);
+				if (zreader->isValid())	// must check if it worked.
+					reader = zreader;
+				else
+					delete zreader;
+			}
+		}
+		if (reader == nullptr)
+			reader = new MusicIO::FileSystemSoundFontReader(args, true);
 	}
 
 	if (reader == nullptr)