aboutsummaryrefslogtreecommitdiff
path: root/engines/touche
diff options
context:
space:
mode:
authorMax Horn2011-03-23 15:23:26 +0100
committerMax Horn2011-03-23 15:25:47 +0100
commit29847ea42da3e597d3496972c80ce49bea76da20 (patch)
tree654596bc11032f28d9b2a776571fdb7623ceb5c6 /engines/touche
parentc70c8864f131bfe42437b05d03f77ab198f59247 (diff)
downloadscummvm-rg350-29847ea42da3e597d3496972c80ce49bea76da20.tar.gz
scummvm-rg350-29847ea42da3e597d3496972c80ce49bea76da20.tar.bz2
scummvm-rg350-29847ea42da3e597d3496972c80ce49bea76da20.zip
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.
Diffstat (limited to 'engines/touche')
-rw-r--r--engines/touche/midi.cpp4
-rw-r--r--engines/touche/midi.h7
2 files changed, 1 insertions, 10 deletions
diff --git a/engines/touche/midi.cpp b/engines/touche/midi.cpp
index c1270dd2e2..c6c7a60dfd 100644
--- a/engines/touche/midi.cpp
+++ b/engines/touche/midi.cpp
@@ -107,10 +107,6 @@ int MidiPlayer::open() {
return ret;
}
-bool MidiPlayer::isOpen() const {
- return _driver && _driver->isOpen();
-}
-
void MidiPlayer::close() {
stop();
diff --git a/engines/touche/midi.h b/engines/touche/midi.h
index 75f33269a7..a750f12bec 100644
--- a/engines/touche/midi.h
+++ b/engines/touche/midi.h
@@ -39,7 +39,7 @@ namespace Common {
namespace Touche {
-class MidiPlayer : public MidiDriver {
+class MidiPlayer : public MidiDriver_BASE {
public:
enum {
@@ -59,14 +59,9 @@ public:
// MidiDriver interface
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; }
- MidiChannel *allocateChannel() { return 0; }
- MidiChannel *getPercussionChannel() { return 0; }
private: