2 files changed, 3 insertions, 14 deletions
diff --git a/engines/m4/midi.cpp b/engines/m4/midi.cpp
index 3a6475da89..36f7f29a2e 100644
--- a/engines/m4/midi.cpp
+++ b/engines/m4/midi.cpp
@@ -33,11 +33,12 @@
 namespace M4 {
 
 MidiPlayer::MidiPlayer(MadsM4Engine *vm, MidiDriver *driver) : _vm(vm), _midiData(NULL), _driver(driver), _isPlaying(false), _passThrough(false), _isGM(false) {
+	assert(_driver);
 	memset(_channel, 0, sizeof(_channel));
 	_masterVolume = 0;
 	_parser = MidiParser::createParser_SMF();
 	_parser->setMidiDriver(this);
-	_parser->setTimerRate(getBaseTempo());
+	_parser->setTimerRate(_driver->getBaseTempo());
 	open();
 }
 
@@ -83,10 +84,6 @@ int MidiPlayer::open() {
 	return 0;
 }
 
-bool MidiPlayer::isOpen() const {
-	return _driver && _driver->isOpen();
-}
-
 void MidiPlayer::close() {
 	stopMusic();
 	if (_driver) {
diff --git a/engines/m4/midi.h b/engines/m4/midi.h
index a631cec2cb..46dc5efd27 100644
--- a/engines/m4/midi.h
+++ b/engines/m4/midi.h
@@ -34,7 +34,7 @@
 
 namespace M4 {
 
-class MidiPlayer : public MidiDriver {
+class MidiPlayer : public MidiDriver_BASE {
 public:
 	MidiPlayer(MadsM4Engine *vm, MidiDriver *driver);
 	~MidiPlayer();
@@ -54,19 +54,11 @@ public:
 
 	//MidiDriver interface implementation
 	int open();
-	bool isOpen() const;
 	void close();
 	void send(uint32 b);
 
 	void metaEvent(byte type, byte *data, uint16 length);
 
-	void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { }
-	uint32 getBaseTempo()	{ return _driver ? _driver->getBaseTempo() : 0; }
-
-	//Channel allocation functions
-	MidiChannel *allocateChannel()		{ return 0; }
-	MidiChannel *getPercussionChannel()	{ return 0; }
-
 protected:
 	static void onTimer(void *data);