diff options
| author | Matthew Hoops | 2012-09-07 09:49:33 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-09-07 09:49:33 -0400 |
| commit | 7e2f7099c892c212409f1c7b69426cd1a1f00552 (patch) | |
| tree | 6ecb50983361d54c14443d39aeae6243e33215fc | |
| parent | c22f76dbbc487b5a5e89d327bec2c550ce47378c (diff) | |
| download | scummvm-rg350-7e2f7099c892c212409f1c7b69426cd1a1f00552.tar.gz scummvm-rg350-7e2f7099c892c212409f1c7b69426cd1a1f00552.tar.bz2 scummvm-rg350-7e2f7099c892c212409f1c7b69426cd1a1f00552.zip | |
AUDIO: Keep track of the QuickTime MIDI time scale
| -rw-r--r-- | audio/midiparser_qt.cpp | 2 | ||||
| -rw-r--r-- | audio/midiparser_qt.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/audio/midiparser_qt.cpp b/audio/midiparser_qt.cpp index 8ddf6d66e7..7b20f62cb7 100644 --- a/audio/midiparser_qt.cpp +++ b/audio/midiparser_qt.cpp @@ -69,6 +69,7 @@ bool MidiParser_QT::loadFromTune(Common::SeekableReadStream *stream, DisposeAfte trackInfo.data = (byte *)malloc(trackSize); stream->read(trackInfo.data, trackSize); + trackInfo.timeScale = 600; // the default _trackInfo.push_back(trackInfo); initCommon(); @@ -182,6 +183,7 @@ void MidiParser_QT::initFromContainerTracks() { MIDITrackInfo trackInfo; trackInfo.noteRequests = entry->_noteRequests; trackInfo.data = readWholeTrack(tracks[i]); + trackInfo.timeScale = tracks[i]->timeScale; _trackInfo.push_back(trackInfo); } } diff --git a/audio/midiparser_qt.h b/audio/midiparser_qt.h index 0047803fc4..6e4ded8e74 100644 --- a/audio/midiparser_qt.h +++ b/audio/midiparser_qt.h @@ -75,6 +75,7 @@ private: struct MIDITrackInfo { NoteRequestList noteRequests; byte *data; + uint32 timeScale; }; class MIDISampleDesc : public SampleDesc { |