fix a few more static variable problems in Timidity++

* rcf_count in Instruments::read_config_file
* sbk_convertors shoukd be const
* Instruments::chunkid.idstring should be const - also reduced memory usage by using char array instead of char *.
* Instruments::get_importers.get_importers: sample_importers cannot be statically initialized so make it a non-static local variable instead.

Author: coelckers

thirdparty/timidity/timidity.cpp

@@ -182,7 +182,6 @@ int Instruments::read_config_file(const char *name)
 	char tmp[1024], *cp;
 	ToneBank *bank = NULL;
 	int i, j, k, line = 0, words;
-	static int rcf_count = 0;
 
 	if (rcf_count > 50)
 	{

thirdparty/timidity/timidity/instrum.h

@@ -172,6 +172,7 @@ class Instruments
 	ToneBank* drumset[MAXBANK] = {};
 	FontFile* Fonts = nullptr;
 	std::string def_instr_name;
+	int rcf_count = 0;
 
 	Instruments(MusicIO::SoundFontReaderInterface* reader);
 	~Instruments();

thirdparty/timidityplus/configfile.cpp

@@ -619,7 +619,6 @@ int Instruments::read_config_file(const char *name, int self, int allow_missing_
 	char buf[1024], *tmp, *w[MAXWORDS + 1], *cp;
 	ToneBank *bank = NULL;
 	int i, j, k, line = 0, words, errcnt = 0;
-	static int rcf_count = 0;
 	int dr = 0, bankno = 0, mapid = INST_NO_MAP, origbankno = 0x7FFFFFFF;
 	int extension_flag, param_parse_err;
 	MBlockList varbuf;

thirdparty/timidityplus/instrum.cpp

@@ -1565,7 +1565,6 @@ int Instruments::set_default_instrument(char *name)
 {
 	Instrument *ip;
 	int i;
-	static char *last_name;
 
 	if (name == NULL)
 	{

thirdparty/timidityplus/resample.cpp

@@ -44,7 +44,7 @@ static int sample_bounds_min, sample_bounds_max; /* min/max bounds for sample da
 #define DEFAULT_GAUSS_ORDER	25
 std::vector<float> gauss_table_data;
 static float *gauss_table[(1 << FRACTION_BITS)] = { 0 };	/* don't need doubles */
-static int gauss_n = DEFAULT_GAUSS_ORDER;
+static const int gauss_n = DEFAULT_GAUSS_ORDER;
 
 
 static void initialize_newton_coeffs()

thirdparty/timidityplus/sbkconv.cpp

@@ -70,7 +70,7 @@ static int sbk_modsust(int gen, int val);
  * convertor function table
  *----------------------------------------------------------------*/
 
-static SBKConv sbk_convertors[T_EOT] = {
+static const SBKConv sbk_convertors[T_EOT] = {
 	NULL, NULL, NULL, NULL, NULL,
 
 	sbk_cutoff, sbk_filterQ, sbk_tenpct, sbk_panpos, sbk_atten, sbk_scale,

thirdparty/timidityplus/sffile.cpp

@@ -225,8 +225,8 @@ void Instruments::free_soundfont(SFInfo *sf)
 
 int Instruments::chunkid(char *id)
 {
-	static struct idstring {
-		const char *str;
+	static const struct idstring {
+		const char str[5];
 		int id;
 	} idlist[] = {
 		{"RIFF", RIFF_ID},

thirdparty/timidityplus/smplfile.cpp

@@ -127,7 +127,7 @@ Instrument *Instruments::extract_sample_file(char *sample_file)
 /* returns number of importers which may be suitable for the file */
 int Instruments::get_importers(const char *sample_file, int limit, SampleImporter **importers)
 {
-	static SampleImporter	sample_importers[] = {
+	SampleImporter	sample_importers[] = {
 		{"wav", &Instruments::import_wave_discriminant, &Instruments::import_wave_load},
 		{"aiff", &Instruments::import_aiff_discriminant, &Instruments::import_aiff_load},
 		{NULL, NULL, NULL},

thirdparty/timidityplus/timiditypp/instrum.h

@@ -346,6 +346,9 @@ class Instruments
 	SampleList *last_sample_list = nullptr;
 
 	LayerItem layer_items[SF_EOF];
+	// formerly static function-local variables.
+	int rcf_count = 0;
+	char *last_name;
 
 	/* convert from 8bit value to fractional offset (15.15) */
 	int32_t to_offset_22(int offset)