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/tinsel | |
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/tinsel')
-rw-r--r-- | engines/tinsel/music.cpp | 4 | ||||
-rw-r--r-- | engines/tinsel/music.h | 9 |
2 files changed, 1 insertions, 12 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index fb0f6b94fb..3e0d87bbb8 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -432,10 +432,6 @@ int MidiMusicPlayer::open() { return 0; } -bool MidiMusicPlayer::isOpen() const { - return _driver && _driver->isOpen(); -} - void MidiMusicPlayer::close() { stop(); if (_driver) { diff --git a/engines/tinsel/music.h b/engines/tinsel/music.h index 8f5acc51d0..a75f2b8617 100644 --- a/engines/tinsel/music.h +++ b/engines/tinsel/music.h @@ -60,7 +60,7 @@ SCNHANDLE GetTrackOffset(int trackNumber); void dumpMusic(); -class MidiMusicPlayer : public MidiDriver { +class MidiMusicPlayer : public MidiDriver_BASE { public: MidiMusicPlayer(MidiDriver *driver); ~MidiMusicPlayer(); @@ -80,23 +80,16 @@ 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 *)) { } - // The original sets the "sequence timing" to 109 Hz, whatever that // means. The default is 120. uint32 getBaseTempo() { return _driver ? (109 * _driver->getBaseTempo()) / 120 : 0; } - //Channel allocation functions - MidiChannel *allocateChannel() { return 0; } - MidiChannel *getPercussionChannel() { return 0; } - protected: static void onTimer(void *data); |