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

Change: Improved looping of title song

pull/6825/head
Niels Martin Hansen 2018-06-06 20:58:06 +02:00 committed by Michael Lutz
parent 11a846e3d5
commit a1b7812c7e
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/base_media_base.h
View File

@ -301,6 +301,7 @@ struct MusicSongInfo {
const char *filename; ///< file on disk containing song (when used in MusicSet class, this pointer is owned by MD5File object for the file)
MusicTrackType filetype; ///< decoder required for song file
int cat_index; ///< entry index in CAT file, for filetype==MTT_MPSMIDI
bool loop; ///< song should play in a tight loop if possible, never ending
int override_start; ///< MIDI ticks to skip over in beginning
int override_end; ///< MIDI tick to end the song at (0 if no override)
};

6
src/music/dmusic.cpp
View File

@ -832,8 +832,8 @@ static void MidiThreadProc(void *)
/* end? */
if (current_block == current_file.blocks.size()) {
if (current_segment.loop) {
current_block = 0;
clock->GetTime(&playback_start_time);
current_block = current_segment.start_block;
playback_start_time = block_time - current_file.blocks[current_block].realtime * MIDITIME_TO_REFTIME;
} else {
_playback.do_stop = true;
}
@ -1237,7 +1237,7 @@ void MusicDriver_DMusic::PlaySong(const MusicSongInfo &song)
_playback.next_segment.start = song.override_start;
_playback.next_segment.end = song.override_end;
_playback.next_segment.loop = false;
_playback.next_segment.loop = song.loop;
_playback.do_start = true;
SetEvent(_thread_event);

6
src/music/win32_m.cpp
View File

@ -302,8 +302,8 @@ void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR dwUser, DWORD_PTR, DW
/* end? */
if (_midi.current_block == _midi.current_file.blocks.size()) {
if (_midi.current_segment.loop) {
_midi.current_block = 0;
_midi.playback_start_time = timeGetTime();
_midi.current_block = _midi.current_segment.start_block;
_midi.playback_start_time = timeGetTime() - _midi.current_file.blocks[_midi.current_block].realtime / 1000;
} else {
_midi.do_stop = true;
}
@ -322,7 +322,7 @@ void MusicDriver_Win32::PlaySong(const MusicSongInfo &song)
_midi.next_segment.start = song.override_start;
_midi.next_segment.end = song.override_end;
_midi.next_segment.loop = false;
_midi.next_segment.loop = song.loop;
DEBUG(driver, 2, "Win32-MIDI: PlaySong: setting flag");
_midi.do_stop = _midi.playing;

1
src/music_gui.cpp
View File

@ -191,6 +191,7 @@ static void DoPlaySong()
FioFindFullPath(filename, lastof(filename), OLD_GM_DIR, songinfo.filename);
}
songinfo.filename = filename; // non-owned pointer
songinfo.loop = (_game_mode == GM_MENU) && (_music_wnd_cursong == 1);
MusicDriver::GetInstance()->PlaySong(songinfo);
SetWindowDirty(WC_MUSIC_WINDOW, 0);
}