diff options
Diffstat (limited to 'Medley/src/base/UDraw.pas')
| -rw-r--r-- | Medley/src/base/UDraw.pas | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Medley/src/base/UDraw.pas b/Medley/src/base/UDraw.pas index 1783986f..8bb2c210 100644 --- a/Medley/src/base/UDraw.pas +++ b/Medley/src/base/UDraw.pas @@ -97,6 +97,7 @@ uses URecord, UScreenSing, UScreenSingModi, + USong, UTexture; procedure SingDrawBackground; @@ -1387,7 +1388,13 @@ begin if (CurLyricsTime > 0) and (LyricsState.TotalTime > 0) then begin - LyricsProgress := CurLyricsTime / LyricsState.TotalTime; + if ScreenSong.Mode <> smMedley then + LyricsProgress := CurLyricsTime / LyricsState.TotalTime + else + LyricsProgress := (CurLyricsTime - GetTimeFromBeat(CurrentSong.Medley.StartBeat) + + CurrentSong.Medley.FadeIn_time) / (GetTimeFromBeat(CurrentSong.Medley.EndBeat) + + CurrentSong.Medley.FadeOut_time - GetTimeFromBeat(CurrentSong.Medley.StartBeat) + + CurrentSong.Medley.FadeIn_time); glTexCoord2f((width * LyricsProgress) / 8, 0); glVertex2f(x + width * LyricsProgress, y); |