diff options
author | Simon Howard | 2013-09-08 19:10:40 +0000 |
---|---|---|
committer | Simon Howard | 2013-09-08 19:10:40 +0000 |
commit | f2c204ccca3b93b318cda3aebf29592aa30385e4 (patch) | |
tree | d63ddaa28421cccdf9789673cd2cb2dc688fb982 /src/midifile.c | |
parent | f3afff090adb5af99dc6e1929a9907bf72fda920 (diff) | |
parent | e10af52152ba793d983497cd86d7ccc10d32a13d (diff) | |
download | chocolate-doom-f2c204ccca3b93b318cda3aebf29592aa30385e4.tar.gz chocolate-doom-f2c204ccca3b93b318cda3aebf29592aa30385e4.tar.bz2 chocolate-doom-f2c204ccca3b93b318cda3aebf29592aa30385e4.zip |
Merge from trunk.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2639
Diffstat (limited to 'src/midifile.c')
-rw-r--r-- | src/midifile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/midifile.c b/src/midifile.c index e9af051c..00ff28d4 100644 --- a/src/midifile.c +++ b/src/midifile.c @@ -706,7 +706,7 @@ int MIDI_GetNextEvent(midi_track_iter_t *iter, midi_event_t **event) unsigned int MIDI_GetFileTimeDivision(midi_file_t *file) { - return file->header.time_division; + return SHORT(file->header.time_division); } void MIDI_RestartIterator(midi_track_iter_t *iter) |