From 9dfeb623339a226c33d4f203e12f5629be445d08 Mon Sep 17 00:00:00 2001 From: basisbit Date: Mon, 19 Oct 2015 02:01:57 +0000 Subject: * adapted to build with ffmpeg 2.8.1 * fixed jumping to 5 seconds before singing starts (only for songs with long intro). Press the "s"-key to jump forward to the position. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3146 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/screens/UScreenSing.pas | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/screens') diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas index 48f8d8c6..f5d5d585 100644 --- a/src/screens/UScreenSing.pas +++ b/src/screens/UScreenSing.pas @@ -239,8 +239,7 @@ begin begin if (AudioPlayback.Position < CurrentSong.gap / 1000 - 6) then begin - LyricsState.SetCurrentTime(CurrentSong.gap / 1000 - 5); - AudioPlayback.SetSyncSource(fLyricsSync); + AudioPlayback.SetPosition(CurrentSong.gap / 1000.0 - 5.0); end; Exit; end; @@ -1004,7 +1003,7 @@ var LastWord: TLyricWord; medley_end: boolean; medley_start_applause: boolean; - + DebugStringDeleteSthis:string; begin Background.Draw; @@ -1132,7 +1131,8 @@ begin DrawMedleyCountdown; // check for music finish - //Log.LogError('Check for music finish: ' + BoolToStr(Music.Finished) + ' ' + FloatToStr(LyricsState.CurrentTime*1000) + ' ' + IntToStr(CurrentSong.Finish)); + //Log.LogError + DebugStringDeleteSthis:=('Check for music finish: ' + BoolToStr(not AudioPlayback.Finished) + ' ' + FloatToStr(LyricsState.GetCurrentTime()*1000) + ' ' + IntToStr(CurrentSong.Finish)); if ShowFinish then begin if (not AudioPlayback.Finished) and (not medley_end or (ScreenSong.Mode <> smMedley)) and -- cgit v1.2.3