aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbasisbit <basisbit@b956fd51-792f-4845-bead-9b4dfca2ff2c>2015-10-19 02:01:57 +0000
committerbasisbit <basisbit@b956fd51-792f-4845-bead-9b4dfca2ff2c>2015-10-19 02:01:57 +0000
commit9dfeb623339a226c33d4f203e12f5629be445d08 (patch)
tree75a685e6be5f4cd6bffb0cee18f754536ab727d8
parent82a567fb55cbbe70d6d3c28f44a9c821b73faa08 (diff)
downloadusdx-9dfeb623339a226c33d4f203e12f5629be445d08.tar.gz
usdx-9dfeb623339a226c33d4f203e12f5629be445d08.tar.xz
usdx-9dfeb623339a226c33d4f203e12f5629be445d08.zip
* 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
-rw-r--r--src/lib/ffmpeg-2.8/avutil.pas2
-rw-r--r--src/screens/UScreenSing.pas8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/ffmpeg-2.8/avutil.pas b/src/lib/ffmpeg-2.8/avutil.pas
index 177e277c..4fb3dcef 100644
--- a/src/lib/ffmpeg-2.8/avutil.pas
+++ b/src/lib/ffmpeg-2.8/avutil.pas
@@ -66,7 +66,7 @@ const
(* Min. supported version by this header *)
LIBAVUTIL_MIN_VERSION_MAJOR = 54;
- LIBAVUTIL_MIN_VERSION_MINOR = 31;
+ LIBAVUTIL_MIN_VERSION_MINOR = 30;
LIBAVUTIL_MIN_VERSION_RELEASE = 100;
LIBAVUTIL_MIN_VERSION = (LIBAVUTIL_MIN_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVUTIL_MIN_VERSION_MINOR * VERSION_MINOR) +
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