diff options
author | Max Horn | 2002-12-11 16:09:58 +0000 |
---|---|---|
committer | Max Horn | 2002-12-11 16:09:58 +0000 |
commit | bf62494fd5fc578a609b5986237035997c214b15 (patch) | |
tree | 68c3f90d9ddd0f93fafc1c84548e611d458d88de /simon | |
parent | 5bf87dd3682af7de77fd0fff8d182087ebc8151a (diff) | |
download | scummvm-rg350-bf62494fd5fc578a609b5986237035997c214b15.tar.gz scummvm-rg350-bf62494fd5fc578a609b5986237035997c214b15.tar.bz2 scummvm-rg350-bf62494fd5fc578a609b5986237035997c214b15.zip |
ripped out obsolete midi streaming code from backends (this may break Alsa/SEQ/Windows/Morphos compile, I tried my best, but you'll have to clean up after me)
svn-id: r5905
Diffstat (limited to 'simon')
-rw-r--r-- | simon/midi.cpp | 4 | ||||
-rw-r--r-- | simon/midi.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/simon/midi.cpp b/simon/midi.cpp index 134c03d688..e80021d6a9 100644 --- a/simon/midi.cpp +++ b/simon/midi.cpp @@ -185,9 +185,9 @@ void MidiPlayer::initialize() _midiDriver->property(MidiDriver::PROP_TIMEDIV, _songs[0].ppqn); - res = _midiDriver->open(MidiDriver::MO_STREAMING); + res = _midiDriver->open(); if (res != 0) - error("MidiPlayer::initializer, got %s", MidiDriver::get_error_name(res)); + error("MidiPlayer::initializer, got %s", MidiDriver::getErrorName(res)); if (_paused) _midiDriver->pause (true); diff --git a/simon/midi.h b/simon/midi.h index 3653a37316..9b3cfc7a6a 100644 --- a/simon/midi.h +++ b/simon/midi.h @@ -23,6 +23,7 @@ #define SIMON_MIDI_H class MidiDriver; +class MidiStreamer; class File; struct MidiEvent; @@ -67,7 +68,7 @@ private: byte *sysex_data; }; - MidiDriver *_midiDriver; + MidiStreamer *_midiDriver; uint _lastDelay; Song *_currentSong; Song _songs[8]; |