Merge branch 'develop' into medley

Conflicts:
	Vocaluxe/Lib/Song/CSong.cs

Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml

@@ -497,13 +497,13 @@
       <H>50</H>
       <!--<ArrowLeftX>, <ArrowLeftY>, <ArrowLeftZ>, <ArrowLeftW>, <ArrowLeftH>: Left arrow position, width and height-->
       <ArrowLeftX>505</ArrowLeftX>
-      <ArrowLeftY>225</ArrowLeftY>
+      <ArrowLeftY>285</ArrowLeftY>
       <ArrowLeftZ>0,00</ArrowLeftZ>
       <ArrowLeftW>40</ArrowLeftW>
       <ArrowLeftH>40</ArrowLeftH>
       <!--<ArrowRightX>, <ArrowRightY>, <ArrowRightZ>, <ArrowRightW>, <ArrowRightH>: Right arrow position, width and height-->
       <ArrowRightX>1170</ArrowRightX>
-      <ArrowRightY>225</ArrowRightY>
+      <ArrowRightY>285</ArrowRightY>
       <ArrowRightZ>0,00</ArrowRightZ>
       <ArrowRightW>40</ArrowRightW>
       <ArrowRightH>40</ArrowRightH>
@@ -540,4 +540,4 @@
       <NumVisible>3</NumVisible>
     </SelectSlideVideosToBackground>
   </ScreenOptionsVideo>
-</root>
+</root>

Vocaluxe/Lib/Song/CSong.cs

@@ -79,6 +79,11 @@ namespace Vocaluxe.Lib.Song
         {
             get { return _CoverLoaded; }
         }
+        public bool NotesLoaded
+        {
+            get { return _NotesLoaded; }
+        }
+
         public bool CoverBigLoaded = false;
 
         public STexture CoverTextureSmall

Vocaluxe/Screens/CScreenScore.cs

@@ -263,10 +263,11 @@ namespace Vocaluxe.Screens
 
         private void UpdateRatings()
         {
+            CSong song = null;
             SPlayer[] player = new SPlayer[CGame.NumPlayer];
             if (_Round != 0)
             {
-                CSong song = CGame.GetSong(_Round);
+                song = CGame.GetSong(_Round);
                 if (song == null)
                     return;
 
@@ -299,9 +300,24 @@ namespace Vocaluxe.Screens
                     player[p].Points = (int)(player[p].Points / CGame.NumRounds);
                 }
             }
+
             for (int p = 0; p < player.Length; p++)
             {
-                Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name;
+                if (song != null)
+                {
+                    if (!song.IsDuet)
+                        Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name;
+                    else
+                        if (player[p].LineNr == 0 && song.DuetPart1 != "Part 1")
+                            Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name + " (" + song.DuetPart1 + ")";
+                        else if (player[p].LineNr == 1 && song.DuetPart2 != "Part 2")
+                            Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name + " (" + song.DuetPart2 + ")";
+                        else
+                            Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name;
+                }
+                else
+                    Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name;
+                
                 Texts[htTexts(TextScores[p, CGame.NumPlayer - 1])].Text = ((int)Math.Round(player[p].Points)).ToString("0000") + " " + CLanguage.Translate("TR_SCREENSCORE_POINTS");
                 if (CGame.NumPlayer <= 3)
                 {

Vocaluxe/Screens/CScreenSing.cs

@@ -960,9 +960,11 @@ namespace Vocaluxe.Screens
             float dt = 4f;
             float rt = dt * 0.8f;
 
-            CSong Song = CGame.GetSong();  
+            CSong Song = CGame.GetSong();
             if (Song == null)
                 return null;
+            else if (!Song.NotesLoaded)
+                return null;
 
             float[] Alpha = new float[Song.Notes.Lines.Length * 2];
             CLines[] lines = new CLines[Song.Notes.Lines.Length];