diff options
| author | Jamieson Christian | 2003-05-18 23:55:53 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-05-18 23:55:53 +0000 |
| commit | c81b58d38eb8ca38e8614152000bceb7b2c012ad (patch) | |
| tree | 9401a74b381ab63a31562e0b3e5ddb05c2da2500 /sound/midiparser_smf.cpp | |
| parent | b43bca21cbea217d980887eabbfc73e92fce4c71 (diff) | |
| download | scummvm-rg350-c81b58d38eb8ca38e8614152000bceb7b2c012ad.tar.gz scummvm-rg350-c81b58d38eb8ca38e8614152000bceb7b2c012ad.tar.bz2 scummvm-rg350-c81b58d38eb8ca38e8614152000bceb7b2c012ad.zip | |
Implemented new Simon MIDI module, switching from MidiStreamer to MidiParser. Restructuring enables XMIDI support and vc_72 implementation. Various cleanup on MidiParser's and MidiDriver's.
svn-id: r7654
Diffstat (limited to 'sound/midiparser_smf.cpp')
| -rw-r--r-- | sound/midiparser_smf.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/sound/midiparser_smf.cpp b/sound/midiparser_smf.cpp index b429f7484a..5c72ceb21b 100644 --- a/sound/midiparser_smf.cpp +++ b/sound/midiparser_smf.cpp @@ -48,8 +48,6 @@ protected: uint32 _ppqn; uint32 _psec_per_tick; // Microseconds per delta tick - int _lock; - protected: uint32 read4high (byte * &data) { uint32 val = 0; @@ -109,16 +107,9 @@ uint32 MidiParser_SMF::readVLQ (byte * &data) { } void MidiParser_SMF::onTimer() { - if (_lock++) { - --_lock; - return; - } - if (!_play_pos || !_driver) return; - playToTime (_play_time + _timer_rate, true); - _lock = 0; } void MidiParser_SMF::playToTime (uint32 psec, bool transmit) { @@ -215,7 +206,6 @@ void MidiParser_SMF::playToTime (uint32 psec, bool transmit) { if (transmit) { _driver->metaEvent (event, pos, (uint16) length); } - _lock = 0; return; } else if (event == 0x51) { if (length >= 3) { @@ -238,8 +228,6 @@ void MidiParser_SMF::playToTime (uint32 psec, bool transmit) { _play_pos = pos; } -// This code was adapted from the exult methods -// XMIDI::ExtractTracks and XMIDI::ExtractTracksFromXmi bool MidiParser_SMF::loadMusic (byte *data, uint32 size) { uint32 len; bool isGMD = false; // Indicates an older GMD file without block headers @@ -465,9 +453,6 @@ void MidiParser_SMF::allNotesOff() { } void MidiParser_SMF::unloadMusic() { - while (_lock); - ++_lock; - _play_pos = NULL; _data = NULL; _num_tracks = 0; @@ -476,8 +461,6 @@ void MidiParser_SMF::unloadMusic() { _last_event_time = 0; _running_status = 0; allNotesOff(); - - _lock = 0; } void MidiParser_SMF::setTrack (byte track) { |