diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
index 74d6bfac..958526c2 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
@@ -497,13 +497,13 @@
50
505
- 225
+ 285
0,00
40
40
1170
- 225
+ 285
0,00
40
40
@@ -540,4 +540,4 @@
3
-
\ No newline at end of file
+
diff --git a/Output/x64/avcodec-54.dll b/Output/x64/avcodec-54.dll
index 80d55f54..69e25192 100644
Binary files a/Output/x64/avcodec-54.dll and b/Output/x64/avcodec-54.dll differ
diff --git a/Output/x64/avformat-54.dll b/Output/x64/avformat-54.dll
index f90c2245..861f80f7 100644
Binary files a/Output/x64/avformat-54.dll and b/Output/x64/avformat-54.dll differ
diff --git a/Output/x64/avutil-52.dll b/Output/x64/avutil-52.dll
index f9de4518..320dcca0 100644
Binary files a/Output/x64/avutil-52.dll and b/Output/x64/avutil-52.dll differ
diff --git a/Output/x64/swscale-2.dll b/Output/x64/swscale-2.dll
index e8b1ff96..43f20682 100644
Binary files a/Output/x64/swscale-2.dll and b/Output/x64/swscale-2.dll differ
diff --git a/Output/x86/avcodec-54.dll b/Output/x86/avcodec-54.dll
index 7f53dd68..31558d7e 100644
Binary files a/Output/x86/avcodec-54.dll and b/Output/x86/avcodec-54.dll differ
diff --git a/Output/x86/avformat-54.dll b/Output/x86/avformat-54.dll
index a05f643e..2f7742a4 100644
Binary files a/Output/x86/avformat-54.dll and b/Output/x86/avformat-54.dll differ
diff --git a/Output/x86/avutil-52.dll b/Output/x86/avutil-52.dll
index a476fbe1..7211cde6 100644
Binary files a/Output/x86/avutil-52.dll and b/Output/x86/avutil-52.dll differ
diff --git a/Output/x86/swscale-2.dll b/Output/x86/swscale-2.dll
index 90f07328..9a0f1bf6 100644
Binary files a/Output/x86/swscale-2.dll and b/Output/x86/swscale-2.dll differ
diff --git a/Vocaluxe/Lib/Song/CSong.cs b/Vocaluxe/Lib/Song/CSong.cs
index 7485bc3d..72bd1593 100644
--- a/Vocaluxe/Lib/Song/CSong.cs
+++ b/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
diff --git a/Vocaluxe/Screens/CScreenScore.cs b/Vocaluxe/Screens/CScreenScore.cs
index 17f7b158..5f652325 100644
--- a/Vocaluxe/Screens/CScreenScore.cs
+++ b/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)
{
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index 7f697b5e..89f13b91 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/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];