diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml
index 09014983..6e94ebeb 100644
--- a/Output/Themes/Ambient/Screens/ScreenSong.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSong.xml
@@ -228,6 +228,186 @@
+
+
+ 1070
+ 65
+
+ -2,11
+
+ 50
+
+ 350
+
+
+ Player1
+
+
+ Player1
+
+ Left
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 1070
+ 135
+
+ -2,11
+
+ 50
+
+ 350
+
+
+ Player2
+
+
+ Player2
+
+ Left
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 1070
+ 205
+
+ -2,11
+
+ 50
+
+ 350
+
+
+ Player3
+
+
+ Player3
+
+ Left
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 1070
+ 275
+
+ -2,11
+
+ 50
+
+ 350
+
+
+ Player4
+
+
+ Player4
+
+ Left
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 1070
+ 345
+
+ -2,11
+
+ 50
+
+ 350
+
+
+ Player5
+
+
+ Player5
+
+ Left
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 1070
+ 415
+
+ -2,11
+
+ 50
+
+ 350
+
+
+ Player6
+
+
+ Player6
+
+ Left
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
Button
diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs
index 98c232ee..36e4d9fa 100644
--- a/Vocaluxe/Screens/CScreenSong.cs
+++ b/Vocaluxe/Screens/CScreenSong.cs
@@ -57,6 +57,7 @@ namespace Vocaluxe.Screens
private bool _SearchActive = false;
private List ButtonsJoker = new List();
+ private List TextsPlayer = new List();
private bool _SongOptionsActive = false;
private bool _PlaylistActive = false;
private List _AvailableGameModes;
@@ -80,24 +81,36 @@ namespace Vocaluxe.Screens
{
ButtonsJoker.Add("ButtonJoker" + (i + 1));
}
- List list = new List();
- list.AddRange(ButtonsJoker);
- list.Add(ButtonOptionsClose);
- list.Add(ButtonOptionsPlaylist);
- list.Add(ButtonOptionsSing);
- list.Add(ButtonOptionsRandom);
- list.Add(ButtonOptionsRandomCategory);
- list.Add(ButtonOptionsSingAll);
- list.Add(ButtonOptionsSingAllVisible);
- list.Add(ButtonOptionsOpenPlaylist);
- list.Add(ButtonOpenOptions);
- list.Add(ButtonStart);
+ List blist = new List();
+ blist.AddRange(ButtonsJoker);
+ blist.Add(ButtonOptionsClose);
+ blist.Add(ButtonOptionsPlaylist);
+ blist.Add(ButtonOptionsSing);
+ blist.Add(ButtonOptionsRandom);
+ blist.Add(ButtonOptionsRandomCategory);
+ blist.Add(ButtonOptionsSingAll);
+ blist.Add(ButtonOptionsSingAllVisible);
+ blist.Add(ButtonOptionsOpenPlaylist);
+ blist.Add(ButtonOpenOptions);
+ blist.Add(ButtonStart);
+
+ for (int i = 0; i < _Base.Settings.GetMaxNumPlayer(); i++)
+ {
+ TextsPlayer.Add("TextPlayer" + (i + 1));
+ }
+ List tlist = new List();
+ tlist.AddRange(TextsPlayer);
+ tlist.Add(TextCategory);
+ tlist.Add(TextSelection);
+ tlist.Add(TextSearchBarTitle);
+ tlist.Add(TextSearchBar);
+ tlist.Add(TextOptionsTitle);
_ThemeName = "ScreenSong";
_ScreenVersion = ScreenVersion;
_ThemeStatics = new string[] { StaticSearchBar, StaticOptionsBG };
- _ThemeTexts = new string[] { TextCategory, TextSelection, TextSearchBarTitle, TextSearchBar, TextOptionsTitle };
- _ThemeButtons = list.ToArray();
+ _ThemeTexts = tlist.ToArray();
+ _ThemeButtons = blist.ToArray();
_ThemeSelectSlides = new string[] { SelectSlideOptionsMode, SelectSlideOptionsPlaylistAdd, SelectSlideOptionsPlaylistOpen };
_ThemeSongMenus = new string[] { SongMenu };
_ThemePlaylists = new string[] { Playlist };
@@ -676,16 +689,20 @@ namespace Vocaluxe.Screens
{
Buttons[htButtons(ButtonStart)].Visible = true;
SongMenus[htSongMenus(SongMenu)].SetSmallView(true);
- for (int i = 0; i < ButtonsJoker.Count; i++)
+ for (int i = 0; i < _Base.Settings.GetMaxNumPlayer(); i++)
{
if (i < _sso.Selection.NumJokers.Length)
{
Buttons[htButtons(ButtonsJoker[i])].Visible = true;
Buttons[htButtons(ButtonsJoker[i])].Text.Text = _sso.Selection.NumJokers[i].ToString();
+ Texts[htTexts(TextsPlayer[i])].Visible = true;
+ //TODO: Set text to player-name.
+ Texts[htTexts(TextsPlayer[i])].Text = i.ToString();
}
else
{
Buttons[htButtons(ButtonsJoker[i])].Visible = false;
+ Texts[htTexts(TextsPlayer[i])].Visible = false;
}
}
}
@@ -694,9 +711,10 @@ namespace Vocaluxe.Screens
Buttons[htButtons(ButtonStart)].Visible = true;
if(SongMenus[htSongMenus(SongMenu)].IsSmallView())
SongMenus[htSongMenus(SongMenu)].SetSmallView(false);
- for (int i = 0; i < ButtonsJoker.Count; i++)
+ for (int i = 0; i < _Base.Settings.GetMaxNumPlayer(); i++)
{
Buttons[htButtons(ButtonsJoker[i])].Visible = false;
+ Texts[htTexts(TextsPlayer[i])].Visible = false;
}
}