From 1112a69adb9f7cd3eeab4dcea72b225c9c2dfb62 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 25 Sep 2019 17:26:19 +0200
Subject: [PATCH] - fixed a few Timidity warnings

---
 libraries/timidity/instrum_font.cpp               | 4 ++++
 libraries/timidityplus/mix.cpp                    | 5 +----
 libraries/timidityplus/playmidi.cpp               | 3 +--
 libraries/timidityplus/timiditypp/timidity_file.h | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libraries/timidity/instrum_font.cpp b/libraries/timidity/instrum_font.cpp
index 5eda23147e..cddaf41c93 100644
--- a/libraries/timidity/instrum_font.cpp
+++ b/libraries/timidity/instrum_font.cpp
@@ -8,6 +8,10 @@
 #include "instrum.h"
 #include "sf2.h"
 
+#ifndef _WIN32
+#include <strings.h>
+#define stricmp strcasecmp
+#endif
 
 namespace Timidity
 {
diff --git a/libraries/timidityplus/mix.cpp b/libraries/timidityplus/mix.cpp
index 204dc46ed2..7d7eff5d04 100644
--- a/libraries/timidityplus/mix.cpp
+++ b/libraries/timidityplus/mix.cpp
@@ -1182,9 +1182,6 @@ int Mixer::recompute_envelope(int v)
 /* Envelope ran out. */
 void Mixer::voice_ran_out(int v)
 {
-	/* Already displayed as dead */
-	int died = (player->voice[v].status == VOICE_DIE);
-	
 	player->free_voice(v);
 }
 
@@ -1624,4 +1621,4 @@ int Mixer::recompute_modulation_envelope(int v)
 	return modenv_next_stage(v);
 }
 
-}
\ No newline at end of file
+}
diff --git a/libraries/timidityplus/playmidi.cpp b/libraries/timidityplus/playmidi.cpp
index f87b3c2bb0..2db489549b 100644
--- a/libraries/timidityplus/playmidi.cpp
+++ b/libraries/timidityplus/playmidi.cpp
@@ -137,7 +137,7 @@ Player::Player(Instruments *instr)
 	temper_adj = 0;
 	current_play_tempo = 500000;
 	opt_realtime_playing = 0;
-	check_eot_flag;
+	check_eot_flag = 0;
 	playmidi_seek_flag = 0;
 	opt_pure_intonation = 0;
 	current_freq_table = 0;
@@ -6040,7 +6040,6 @@ static const struct ctl_chg_types {
 
 int Player::convert_midi_control_change(int chn, int type, int val, MidiEvent *ev_ret)
 {
-	int etype = -1;
 	for (auto &t : ctl_chg_list)
 	{
 		if (t.mtype == type)
diff --git a/libraries/timidityplus/timiditypp/timidity_file.h b/libraries/timidityplus/timiditypp/timidity_file.h
index df1a73c0b4..38c0856355 100644
--- a/libraries/timidityplus/timiditypp/timidity_file.h
+++ b/libraries/timidityplus/timiditypp/timidity_file.h
@@ -40,6 +40,7 @@ struct timidity_file
 class SoundFontReaderInterface
 {
 public:
+	virtual ~SoundFontReaderInterface() {}
 	virtual struct timidity_file* open_timidityplus_file(const char* fn) = 0;
 	virtual void timidityplus_add_path(const char* path) = 0;
 };