diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-07-11 03:19:06 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-07-11 03:19:06 +0300 |
| commit | 1b6e182e0de8a6b7a45297741ac5e7ffb9bbb2ca (patch) | |
| tree | c0a2051b20ced0a80cc2d34594b57f3e47e5a9e0 /src/midi_sequencer_impl.hpp | |
| parent | 683d948e0c45b3b3026d00afbcf9a49e7e89d8ea (diff) | |
| download | libADLMIDI-1b6e182e0de8a6b7a45297741ac5e7ffb9bbb2ca.tar.gz libADLMIDI-1b6e182e0de8a6b7a45297741ac5e7ffb9bbb2ca.tar.bz2 libADLMIDI-1b6e182e0de8a6b7a45297741ac5e7ffb9bbb2ca.zip | |
Sequencer: Fixed GMF support
Diffstat (limited to 'src/midi_sequencer_impl.hpp')
| -rw-r--r-- | src/midi_sequencer_impl.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/midi_sequencer_impl.hpp b/src/midi_sequencer_impl.hpp index 4d5217a..b25fb36 100644 --- a/src/midi_sequencer_impl.hpp +++ b/src/midi_sequencer_impl.hpp @@ -2268,10 +2268,11 @@ bool BW_MidiSequencer::parseGMF(FileAndMemReader &fr) { m_errorString = fr.fileName() + ": Invalid format, GMF\\x1 signature is not found!\n"; // GMD/MUS files (ScummVM) - fr.seek(7 - static_cast<long>(headerSize), FileAndMemReader::CUR); return false; } + fr.seek(7 - static_cast<long>(headerSize), FileAndMemReader::CUR); + rawTrackData.clear(); rawTrackData.resize(trackCount, std::vector<uint8_t>()); m_invDeltaTicks = fraction<uint64_t>(1, 1000000l * static_cast<uint64_t>(deltaTicks)); @@ -2293,7 +2294,6 @@ bool BW_MidiSequencer::parseGMF(FileAndMemReader &fr) fsize = fr.read(&rawTrackData[tk][0], 1, trackLength); if(fsize < trackLength) { - fr.close(); m_errorString = fr.fileName() + ": Unexpected file ending while getting raw track data!\n"; return false; } |