AUDIO: Move more common code to Audio::MidiPlayer

This also should fix some regressions from the previous
commits, related to MidiParser's either being leaked,
or being deleted and then used again (i.e., crashing).

I tested as many games as I had available, but further
testing of all affected engines is called for anyway.

1 files changed, 0 insertions, 7 deletions

diff --git a/engines/made/music.h b/engines/made/music.h
index 8925440b75..f8f70cdad6 100644
--- a/engines/made/music.h
+++ b/engines/made/music.h
@@ -44,7 +44,6 @@ enum MusicFlags {
 class MusicPlayer : public Audio::MidiPlayer {
 public:
 	MusicPlayer();
-	~MusicPlayer();
 
 	void playXMIDI(GenericResource *midiResource, MusicFlags flags = MUSIC_NORMAL);
 	void playSMF(GenericResource *midiResource, MusicFlags flags = MUSIC_NORMAL);
@@ -52,16 +51,10 @@ public:
 	void pause();
 	void resume();
 
-	void setGM(bool isGM) { _isGM = isGM; }
-
 	// MidiDriver_BASE interface implementation
 	virtual void send(uint32 b);
 
 protected:
-
-	static void onTimer(void *data);
-
-	MidiParser *_xmidiParser, *_smfParser;
 	bool _isGM;
 };