From 7949d7c6def2df6f3d44db4f55e9d1d3a87a0412 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 25 Mar 2011 14:10:02 +0100
Subject: 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.
---
 engines/m4/midi.h | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'engines/m4/midi.h')

diff --git a/engines/m4/midi.h b/engines/m4/midi.h
index e1f92cd4b6..a544fb72aa 100644
--- a/engines/m4/midi.h
+++ b/engines/m4/midi.h
@@ -35,10 +35,8 @@ namespace M4 {
 class MidiPlayer : public Audio::MidiPlayer {
 public:
 	MidiPlayer(MadsM4Engine *vm);
-	~MidiPlayer();
 
 	void playMusic(const char *name, int32 vol, bool loop, int32 trigger, int32 scene);
-	virtual void stop();
 
 	void setGM(bool isGM) { _isGM = isGM; }
 
@@ -46,10 +44,7 @@ public:
 	virtual void send(uint32 b);
 
 protected:
-	static void onTimer(void *data);
-
 	MadsM4Engine *_vm;
-	byte *_midiData;
 
 	bool _isGM;
 
-- 
cgit v1.2.3