AUDIO: Change several fake MidiDrivers to MidiDriver_BASE subclasses

Many engines follow the advice in audio/midiparser.h and create a
"pseudo-MidiDriver" subclass. But MidiParser really only needs a tiny
subset of the MidiDriver capabilities, namely those found in
MidiDriver_BASE. So we try to subclass from that whenever possible; this
allows us to remove many stub methods, and enables further future
simplifications.

2 files changed, 1 insertions, 11 deletions

diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 3e1f3e3f3d..b6835052cf 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -76,10 +76,6 @@ int MusicDriver::open() {
 	return 0;
 }
 
-bool MusicDriver::isOpen() const {
-	return _driver->isOpen();
-}
-
 void MusicDriver::setVolume(int volume) {
 	volume = CLIP(volume, 0, 255);
 
diff --git a/engines/saga/music.h b/engines/saga/music.h
index 22d957eb06..0b7d21d99c 100644
--- a/engines/saga/music.h
+++ b/engines/saga/music.h
@@ -44,7 +44,7 @@ enum MusicFlags {
 	MUSIC_DEFAULT = 0xffff
 };
 
-class MusicDriver : public MidiDriver {
+class MusicDriver : public MidiDriver_BASE {
 public:
 	MusicDriver();
 	~MusicDriver();
@@ -67,16 +67,10 @@ public:
 	void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { _driver->setTimerCallback(timerParam, timerProc); }
 	uint32 getBaseTempo()	{ return _driver->getBaseTempo(); }
 
-	//Channel allocation functions
-	MidiChannel *allocateChannel()		{ return 0; }
-	MidiChannel *getPercussionChannel()	{ return 0; }
-
 	Common::Mutex _mutex;
 
 protected:
 
-	static void onTimer(void *data);
-
 	MidiChannel *_channel[16];
 	MidiDriver *_driver;
 	MusicType _driverType;