mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Time values should be DWORD everywhere in win32_m

pull/7639/head
Niels Martin Hansen 2019-07-04 21:40:42 +02:00
parent f8633fc63b
commit 9839ce006c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/music/win32_m.cpp
View File

@ -43,7 +43,7 @@ static struct {
MidiFile current_file; ///< file currently being played from MidiFile current_file; ///< file currently being played from
PlaybackSegment current_segment; ///< segment info for current playback PlaybackSegment current_segment; ///< segment info for current playback
size_t playback_start_time; ///< timestamp current file began playback DWORD playback_start_time; ///< timestamp current file began playback
size_t current_block; ///< next block index to send size_t current_block; ///< next block index to send
MidiFile next_file; ///< upcoming file to play MidiFile next_file; ///< upcoming file to play
PlaybackSegment next_segment; ///< segment info for upcoming file PlaybackSegment next_segment; ///< segment info for upcoming file
@ -199,7 +199,7 @@ void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR dwUser, DWORD_PTR, DW
* The delay compensation is needed to avoid time-compression of following messages. * The delay compensation is needed to avoid time-compression of following messages.
*/ */
DEBUG(driver, 2, "Win32-MIDI: timer: start from block %d (ticktime %d, realtime %.3f, bytes %d)", (int)bl, (int)block.ticktime, ((int)block.realtime) / 1000.0, (int)preload_bytes); DEBUG(driver, 2, "Win32-MIDI: timer: start from block %d (ticktime %d, realtime %.3f, bytes %d)", (int)bl, (int)block.ticktime, ((int)block.realtime) / 1000.0, (int)preload_bytes);
_midi.playback_start_time -= block.realtime / 1000 - preload_bytes * 1000 / 3125; _midi.playback_start_time -= block.realtime / 1000 - (DWORD)(preload_bytes * 1000 / 3125);
break; break;
} }
} }
@ -209,7 +209,7 @@ void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR dwUser, DWORD_PTR, DW
/* play pending blocks */ /* play pending blocks */
DWORD current_time = timeGetTime(); DWORD current_time = timeGetTime();
size_t playback_time = current_time - _midi.playback_start_time; DWORD playback_time = current_time - _midi.playback_start_time;
while (_midi.current_block < _midi.current_file.blocks.size()) { while (_midi.current_block < _midi.current_file.blocks.size()) {
MidiFile::DataBlock &block = _midi.current_file.blocks[_midi.current_block]; MidiFile::DataBlock &block = _midi.current_file.blocks[_midi.current_block];