a bit more const-ness

Added const to a few more static tables.
Removed redundant printMessage pointers in Timidity++ and GUS players.
add pragma for better code generation with MSVC and pointers-to-member-functions.

Author: coelckers

thirdparty/timidity/instrum_sf2.cpp

@@ -169,20 +169,20 @@ static void ParseGen(SFFile *sf2, timidity_file *f, uint32_t chunkid, uint32_t c
 static void ParseInst(SFFile *sf2, timidity_file *f, uint32_t chunkid, uint32_t chunklen);
 static void ParseShdr(SFFile *sf2, timidity_file *f, uint32_t chunkid, uint32_t chunklen);
 
-ListHandler INFOHandlers[] =
+static const ListHandler INFOHandlers[] =
 {
 	{ ID_ifil, ParseIfil },
 	{ 0, 0 }
 };
 
-ListHandler SdtaHandlers[] =
+static const ListHandler SdtaHandlers[] =
 {
 	{ ID_smpl, ParseSmpl },
 	{ ID_sm24, ParseSm24 },
 	{ 0, 0 }
 };
 
-ListHandler PdtaHandlers[] =
+static const ListHandler PdtaHandlers[] =
 {
 	{ ID_phdr, ParsePhdr },
 	{ ID_pbag, ParseBag },
@@ -338,9 +338,9 @@ static void ParseIfil(SFFile *sf2, timidity_file *f, uint32_t chunkid, uint32_t
 	sf2->MinorVersion = minor;
 }
 
-static void ParseLIST(SFFile *sf2, timidity_file *f, uint32_t chunklen, ListHandler *handlers)
+static void ParseLIST(SFFile *sf2, timidity_file *f, uint32_t chunklen, const ListHandler *handlers)
 {
-	ListHandler *handler;
+	const ListHandler *handler;
 	uint32_t id;
 	uint32_t len;
 

thirdparty/timidity/timidity.cpp

@@ -822,7 +822,7 @@ void Renderer::MarkInstrument(int banknum, int percussion, int instr)
 }
 
 
-static void default_cmsg(int type, int verbosity_level, const char* fmt, ...)
+void printMessage(int type, int verbosity_level, const char* fmt, ...)
 {
 	if (verbosity_level >= VERB_NOISY) return;	// Don't waste time on diagnostics.
 
@@ -832,8 +832,5 @@ static void default_cmsg(int type, int verbosity_level, const char* fmt, ...)
 	va_end(args);
 }
 
-// Allow hosting applications to capture the messages and deal with them themselves.
-void (*printMessage)(int type, int verbosity_level, const char* fmt, ...) = default_cmsg;
-
 
 }

thirdparty/timidity/timidity/timidity.h

@@ -48,7 +48,7 @@ enum
 	VERB_DEBUG
 };
 
-extern void (*printMessage)(int type, int verbosity_level, const char *fmt, ...);
+extern void printMessage(int type, int verbosity_level, const char *fmt, ...);
 
 
 /*

thirdparty/timidityplus/common.cpp

@@ -155,7 +155,7 @@ int tf_getc(timidity_file *tf)
 	return read == 0 ? EOF : c;
 }
 
-void default_ctl_cmsg(int type, int verbosity_level, const char* fmt, ...)
+void printMessage(int type, int verbosity_level, const char* fmt, ...)
 {
 	if (verbosity_level >= VERB_DEBUG) return;	// Don't waste time on diagnostics.
 
@@ -165,7 +165,4 @@ void default_ctl_cmsg(int type, int verbosity_level, const char* fmt, ...)
 	va_end(args);
 }
 
-// Allow hosting applications to capture the messages and deal with them themselves.
-void (*printMessage)(int type, int verbosity_level, const char* fmt, ...) = default_ctl_cmsg;
-
 }

thirdparty/timidityplus/timiditypp/controls.h

@@ -52,7 +52,7 @@ inline bool RC_IS_SKIP_FILE(int rc)
 }
 
 
-extern void (*printMessage)(int type, int verbosity_level, const char* fmt, ...);
+extern void printMessage(int type, int verbosity_level, const char* fmt, ...);
 
 
 }

thirdparty/timidityplus/timiditypp/reverb.h

@@ -234,6 +234,14 @@ typedef struct _EffectList {
 	struct _EffectList *next_ef;
 } EffectList;
 
+
+#ifdef _MSC_VER
+// needed on MSVC to make Reverb::effects_engine truly const.
+// Due to Reverb being forward declared the default cannot be statically set up.
+#pragma pointers_to_members( full_generality, single_inheritance )
+#endif
+
+
 struct _EffectEngine {
 	int type;
 	const char *name;
@@ -548,8 +556,7 @@ struct multi_eq_xg_t
 };
 
 
-
-class Reverb
+class Reverb final
 {
 	double REV_INP_LEV;
 

thirdparty/wildmidi/gus_pat.cpp

@@ -37,7 +37,7 @@ namespace WildMidi
 
 	/* Guspat Envelope Rate Timings */
 
-	float env_time_table[] = {
+	extern const float env_time_table[] = {
 		/* Row 1 = (4095.0 / (x * ( 1.0 / (1.6 * 14.0)         ))) / 1000000.0 */
 		0.0f,         0.091728000f, 0.045864000f, 0.030576000f, 0.022932000f, 0.018345600f, 0.015288000f, 0.013104000f,
 		0.011466000f, 0.010192000f, 0.009172800f, 0.008338909f, 0.007644000f, 0.007056000f, 0.006552000f, 0.006115200f,

thirdparty/wildmidi/wildmidi/gus_pat.h

@@ -32,7 +32,7 @@ namespace WildMidi
 
 class SoundFontReaderInterface;
 /* Guspat Envelope Rate Timings */
-extern float env_time_table[];
+extern float const env_time_table[];
 
 }