aboutsummaryrefslogtreecommitdiff
path: root/sound/midistreamer.cpp
diff options
context:
space:
mode:
authorMax Horn2002-12-11 16:09:58 +0000
committerMax Horn2002-12-11 16:09:58 +0000
commitbf62494fd5fc578a609b5986237035997c214b15 (patch)
tree68c3f90d9ddd0f93fafc1c84548e611d458d88de /sound/midistreamer.cpp
parent5bf87dd3682af7de77fd0fff8d182087ebc8151a (diff)
downloadscummvm-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 'sound/midistreamer.cpp')
-rw-r--r--sound/midistreamer.cpp20
1 files changed, 8 insertions, 12 deletions
diff --git a/sound/midistreamer.cpp b/sound/midistreamer.cpp
index ed32ef7934..c8863028ab 100644
--- a/sound/midistreamer.cpp
+++ b/sound/midistreamer.cpp
@@ -27,7 +27,7 @@ MidiStreamer::MidiStreamer (MidiDriver *target) :
_target (target),
_stream_proc (0),
_stream_param (0),
-_mode (0),
+_isOpen (false),
_paused (false),
_event_count (0),
_event_index (0),
@@ -41,7 +41,7 @@ void MidiStreamer::set_stream_callback (void *param, StreamCallback *sc)
_stream_param = param;
_stream_proc = sc;
- if (_mode) {
+ if (_isOpen) {
_event_count = _stream_proc (_stream_param, _events, ARRAYSIZE (_events));
_event_index = 0;
}
@@ -80,23 +80,19 @@ void MidiStreamer::on_timer()
} // end while
}
-int MidiStreamer::open (int mode)
+int MidiStreamer::open()
{
- if (_mode != 0)
+ if (_isOpen)
close();
- int res = _target->open (MidiDriver::MO_SIMPLE);
+ int res = _target->open();
if (res && res != MERR_ALREADY_OPEN)
return res;
_event_index = _event_count = _delay = 0;
- _mode = mode;
+ _isOpen = true;
_paused = false;
- if (mode == MO_SIMPLE)
- return 0;
-
-// g_system->create_thread (timer_thread, this);
_driver_tempo = _target->getBaseTempo() / 500;
_target->setTimerCallback (this, &timer_thread);
@@ -105,7 +101,7 @@ int MidiStreamer::open (int mode)
void MidiStreamer::close()
{
- if (!_mode)
+ if (!_isOpen)
return;
_target->setTimerCallback (NULL, NULL);
@@ -116,7 +112,7 @@ void MidiStreamer::close()
for (i = 0; i < 16; ++i)
_target->send ((0x7B << 8) | 0xB0 | i);
- _mode = 0;
+ _isOpen = false;
_paused = true;
}