diff options
Diffstat (limited to 'engines/scumm/imuse')
-rw-r--r-- | engines/scumm/imuse/imuse_internal.h | 10 | ||||
-rw-r--r-- | engines/scumm/imuse/imuse_player.cpp | 4 |
2 files changed, 1 insertions, 13 deletions
diff --git a/engines/scumm/imuse/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h index d1153a02ef..7d46650d2e 100644 --- a/engines/scumm/imuse/imuse_internal.h +++ b/engines/scumm/imuse/imuse_internal.h @@ -155,7 +155,7 @@ struct CommandQueue { // ////////////////////////////////////////////////// -class Player : public MidiDriver { +class Player : public MidiDriver_BASE { /* * External SysEx handler functions shall each be defined in * a separate file. This header file shall be included at the @@ -282,17 +282,9 @@ public: public: // MidiDriver interface - int open() { return 0; } - bool isOpen() const { return true; } - void close() { } void send(uint32 b); - const char *getErrorName(int error_code) { return "Unknown"; } void sysEx(const byte *msg, uint16 length); void metaEvent(byte type, byte *data, uint16 length); - void setTimerCallback(void *timer_param, void(*timer_proc)(void *)) { } - uint32 getBaseTempo(); - MidiChannel *allocateChannel() { return 0; } - MidiChannel *getPercussionChannel() { return 0; } }; diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp index 9958a934de..4d185d94d7 100644 --- a/engines/scumm/imuse/imuse_player.cpp +++ b/engines/scumm/imuse/imuse_player.cpp @@ -986,10 +986,6 @@ void Player::fixAfterLoad() { } } -uint32 Player::getBaseTempo() { - return (_midi ? _midi->getBaseTempo() : 0); -} - void Player::metaEvent(byte type, byte *msg, uint16 len) { if (type == 0x2F) clear(); |