From bca806b8d311ef00f79eb4acfc5ec1e1ee1ced8f Mon Sep 17 00:00:00 2001
From: Alexander Eckart <brunzel@gmx.li>
Date: Sun, 4 Mar 2012 13:37:18 +0100
Subject: [PATCH] fixed lyric fading (no popping effect any more)

---
 Vocaluxe/Screens/CScreenSing.cs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index 8dc101cf..8e947a04 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -851,19 +851,29 @@ namespace Vocaluxe.Screens
                 lines[i] = Song.Notes.GetLines(i);
                 CLine[] line = lines[i].Line;
 
-                // find current line (it must be the same as in UpdateLyrics)
-                int CurrentLine = 0;
+                // find current line for lyric sub fading (it must be the same as in UpdateLyrics)
+                int CurrentLineSub = 0;
                 for (int j = 0; j < line.Length; j++)
                 {
                     if (line[j].StartBeat <= _CurrentBeat)
                     {
                         if (CGame.GetTimeFromBeats(line[j].FirstBeat, Song.BPM) <= _CurrentTime - Song.Gap + 10f)
                         {
-                            CurrentLine = j;
+                            CurrentLineSub = j;
                         }
                     }
                 }
 
+                // find current line for lyric main fading
+                int CurrentLine = 0;
+                for (int j = 0; j < line.Length; j++)
+                {
+                    if (line[j].FirstBeat <= _CurrentBeat)
+                    {
+                        CurrentLine = j;
+                    }
+                }
+
                 // default values
                 Alpha[i * 2] = 1f;
                 Alpha[i * 2 + 1] = 1f; 
@@ -919,10 +929,10 @@ namespace Vocaluxe.Screens
                 }
 
                 // sub
-                if (CurrentLine < line.Length - 2)
+                if (CurrentLineSub < line.Length - 2)
                 {
                     float diff = 0f; 
-                    diff = CGame.GetTimeFromBeats(line[CurrentLine + 1].FirstBeat, Song.BPM) - CurrentTime;
+                    diff = CGame.GetTimeFromBeats(line[CurrentLineSub + 1].FirstBeat, Song.BPM) - CurrentTime;
                     
                     if (diff > dt)
                     {