diff options
Diffstat (limited to 'engines/m4/midi.cpp')
| -rw-r--r-- | engines/m4/midi.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/m4/midi.cpp b/engines/m4/midi.cpp index 3a6475da89..36f7f29a2e 100644 --- a/engines/m4/midi.cpp +++ b/engines/m4/midi.cpp @@ -33,11 +33,12 @@ namespace M4 { MidiPlayer::MidiPlayer(MadsM4Engine *vm, MidiDriver *driver) : _vm(vm), _midiData(NULL), _driver(driver), _isPlaying(false), _passThrough(false), _isGM(false) { + assert(_driver); memset(_channel, 0, sizeof(_channel)); _masterVolume = 0; _parser = MidiParser::createParser_SMF(); _parser->setMidiDriver(this); - _parser->setTimerRate(getBaseTempo()); + _parser->setTimerRate(_driver->getBaseTempo()); open(); } @@ -83,10 +84,6 @@ int MidiPlayer::open() { return 0; } -bool MidiPlayer::isOpen() const { - return _driver && _driver->isOpen(); -} - void MidiPlayer::close() { stopMusic(); if (_driver) { |