diff options
author | Max Horn | 2011-03-23 15:23:26 +0100 |
---|---|---|
committer | Max Horn | 2011-03-23 15:25:47 +0100 |
commit | 29847ea42da3e597d3496972c80ce49bea76da20 (patch) | |
tree | 654596bc11032f28d9b2a776571fdb7623ceb5c6 /engines/lure/sound.h | |
parent | c70c8864f131bfe42437b05d03f77ab198f59247 (diff) | |
download | scummvm-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/lure/sound.h')
-rw-r--r-- | engines/lure/sound.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/engines/lure/sound.h b/engines/lure/sound.h index 454bff26f4..f4ddb8de79 100644 --- a/engines/lure/sound.h +++ b/engines/lure/sound.h @@ -46,7 +46,7 @@ struct ChannelEntry { uint8 volume; }; -class MidiMusic: public MidiDriver { +class MidiMusic: public MidiDriver_BASE { private: uint8 _soundNumber; uint8 _channelNumber; @@ -86,20 +86,12 @@ public: //MidiDriver interface implementation int open(); - bool isOpen() const; void close(); void send(uint32 b); void onTimer(); 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; } - uint8 channelNumber() { return _channelNumber; } uint8 soundNumber() { return _soundNumber; } bool isPlaying() { return _isPlaying; } |