From fc6de9097f402bb9703c30d31eae15b0df18fa0b Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 14 Nov 2021 12:27:00 +0100
Subject: [PATCH] - ZMusic header update

---
 bin/windows/zmusic/include/zmusic.h | 30 +++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/bin/windows/zmusic/include/zmusic.h b/bin/windows/zmusic/include/zmusic.h
index 0dd186c15..7422b58da 100644
--- a/bin/windows/zmusic/include/zmusic.h
+++ b/bin/windows/zmusic/include/zmusic.h
@@ -29,7 +29,8 @@ typedef enum EMIDIType_
 	MIDI_MIDI,
 	MIDI_HMI,
 	MIDI_XMI,
-	MIDI_MUS
+	MIDI_MUS,
+	MIDI_MIDS
 } EMIDIType;
 
 typedef enum EMidiDevice_
@@ -66,7 +67,8 @@ typedef struct SoundStreamInfo_
 typedef enum SampleType_
 {
 	SampleType_UInt8,
-	SampleType_Int16
+	SampleType_Int16,
+	SampleType_Float32
 } SampleType;
 
 typedef enum ChannelConfig_
@@ -75,6 +77,15 @@ typedef enum ChannelConfig_
 	ChannelConfig_Stereo
 } ChannelConfig;
 
+typedef struct SoundStreamInfoEx_
+{
+	int mBufferSize; // If mBufferSize is 0, the song doesn't use streaming but plays through a different interface.
+	int mSampleRate;
+	SampleType mSampleType;
+	ChannelConfig mChannelConfig;
+} SoundStreamInfoEx;
+
+
 typedef enum EIntConfigKey_
 {
 	zmusic_adl_chips_count,
@@ -263,14 +274,14 @@ typedef struct ZMusicConfigurationSetting_
 
 
 #ifndef ZMUSIC_INTERNAL
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(ZMUSIC_STATIC)
 #define DLL_IMPORT _declspec(dllimport)
-#else // !_MSC_VER
+#else
 #define DLL_IMPORT
-#endif // _MSC_VER
+#endif
 // Note that the internal 'class' definitions are not C compatible!
-typedef struct { int zm1; } *ZMusic_MidiSource;
-typedef struct { int zm2; } *ZMusic_MusicStream;
+typedef struct _ZMusic_MidiSource_Struct { int zm1; } *ZMusic_MidiSource;
+typedef struct _ZMusic_MusicStream_Struct { int zm2; } *ZMusic_MusicStream;
 struct SoundDecoder;
 #endif
 
@@ -313,10 +324,12 @@ extern "C"
 	DLL_IMPORT void ZMusic_Close(ZMusic_MusicStream song);
 	DLL_IMPORT zmusic_bool ZMusic_SetSubsong(ZMusic_MusicStream song, int subsong);
 	DLL_IMPORT zmusic_bool ZMusic_IsLooping(ZMusic_MusicStream song);
+	DLL_IMPORT int ZMusic_GetDeviceType(ZMusic_MusicStream song);
 	DLL_IMPORT zmusic_bool ZMusic_IsMIDI(ZMusic_MusicStream song);
 	DLL_IMPORT void ZMusic_VolumeChanged(ZMusic_MusicStream song);
 	DLL_IMPORT zmusic_bool ZMusic_WriteSMF(ZMusic_MidiSource source, const char* fn, int looplimit);
 	DLL_IMPORT void ZMusic_GetStreamInfo(ZMusic_MusicStream song, SoundStreamInfo *info);
+	DLL_IMPORT void ZMusic_GetStreamInfoEx(ZMusic_MusicStream song, SoundStreamInfoEx *info);
 	// Configuration interface. The return value specifies if a music restart is needed.
 	// RealValue should be written back to the CVAR or whatever other method the client uses to store configuration state.
 	DLL_IMPORT zmusic_bool ChangeMusicSettingInt(EIntConfigKey key, ZMusic_MusicStream song, int value, int* pRealValue);
@@ -404,6 +417,7 @@ typedef zmusic_bool (*pfn_ZMusic_IsMIDI)(ZMusic_MusicStream song);
 typedef void (*pfn_ZMusic_VolumeChanged)(ZMusic_MusicStream song);
 typedef zmusic_bool (*pfn_ZMusic_WriteSMF)(ZMusic_MidiSource source, const char* fn, int looplimit);
 typedef void (*pfn_ZMusic_GetStreamInfo)(ZMusic_MusicStream song, SoundStreamInfo *info);
+typedef void (*pfn_ZMusic_GetStreamInfoEx)(ZMusic_MusicStream song, SoundStreamInfoEx *info);
 typedef zmusic_bool (*pfn_ChangeMusicSettingInt)(EIntConfigKey key, ZMusic_MusicStream song, int value, int* pRealValue);
 typedef zmusic_bool (*pfn_ChangeMusicSettingFloat)(EFloatConfigKey key, ZMusic_MusicStream song, float value, float* pRealValue);
 typedef zmusic_bool (*pfn_ChangeMusicSettingString)(EStringConfigKey key, ZMusic_MusicStream song, const char* value);
@@ -417,4 +431,4 @@ typedef const ZMusicMidiOutDevice *(*pfn_ZMusic_GetMidiDevices)(int *pAmount);
 
 
 
-#endif
\ No newline at end of file
+#endif