diff --git a/Output/Languages/Deutsch.xml b/Output/Languages/Deutsch.xml
index 70908b0c..8fe726bf 100644
--- a/Output/Languages/Deutsch.xml
+++ b/Output/Languages/Deutsch.xml
@@ -122,6 +122,10 @@
Lied singen
Zur Playlist hinzufügen
Schließen
+ Zufälligen Song wählen
+ Alle Songs singen
+ Alle sichtbaren Song singen
+ Playlist öffnen
Neue Playlist
Lied-Optionen
Suche:
diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml
index 56fce85b..10b2e4fa 100644
--- a/Output/Languages/English.xml
+++ b/Output/Languages/English.xml
@@ -122,6 +122,10 @@
Sing
Add to playlist
Close
+ Select a random song
+ Sing all songs
+ Sing all visible songs
+ Open playlist
New Playlist
Song Options
Search:
diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml
index cce3abd5..3d744951 100644
--- a/Output/Themes/Ambient/Screens/ScreenSong.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSong.xml
@@ -200,7 +200,7 @@
- 200
+ 220
45
-2,11
@@ -235,7 +235,7 @@
Button
40
- 290
+ 360
-2,11
360
40
@@ -375,6 +375,251 @@
+
+
+ Button
+
+ Button
+
+ 40
+ 135
+ -2,11
+ 360
+ 40
+
+
+ ButtonColor
+
+
+ ButtonSColor
+
+
+ 180
+ 5
+
+ 30
+
+ 350
+
+
+ ButtonTextColor
+
+
+ ButtonTextSColor
+
+ Center
+
+ Center
+
+
+
+ Outline
+
+ TR_SCREENSONG_BUTTON_SINGALL
+
+
+
+
+
+
+
+
+
+
+ Button
+
+ Button
+
+ 40
+ 180
+ -2,11
+ 360
+ 40
+
+
+ ButtonColor
+
+
+ ButtonSColor
+
+
+ 180
+ 5
+
+ 30
+
+ 350
+
+
+ ButtonTextColor
+
+
+ ButtonTextSColor
+
+ Center
+
+ Center
+
+
+
+ Outline
+
+ TR_SCREENSONG_BUTTON_SINGALLVISIBLE
+
+
+
+
+
+
+
+
+
+
+ Button
+
+ Button
+
+ 40
+ 90
+ -2,11
+ 360
+ 40
+
+
+ ButtonColor
+
+
+ ButtonSColor
+
+
+ 180
+ 5
+
+ 30
+
+ 350
+
+
+ ButtonTextColor
+
+
+ ButtonTextSColor
+
+ Center
+
+ Center
+
+
+
+ Outline
+
+ TR_SCREENSONG_BUTTON_RANDOM
+
+
+
+
+
+
+
+
+
+
+ Button
+
+ Button
+
+ 40
+ 275
+ -2,11
+ 360
+ 40
+
+
+ ButtonColor
+
+
+ ButtonSColor
+
+
+ 180
+ 5
+
+ 30
+
+ 350
+
+
+ ButtonTextColor
+
+
+ ButtonTextSColor
+
+ Center
+
+ Center
+
+
+
+ Outline
+
+ TR_SCREENSONG_BUTTON_OPENPLAYLIST
+
+
+
+
+
+
+
+
+
+
+ Invisible
+
+ Invisible
+
+ 40
+ 40
+ -1,01
+ 360
+ 360
+
+
+ Invisible
+
+
+ Invisible
+
+
+ 180
+ 5
+
+ 30
+
+ 350
+
+
+ ButtonTextColor
+
+
+ ButtonTextSColor
+
+ Center
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+
+
Button
@@ -440,7 +685,7 @@
1
-
+
Button
@@ -504,7 +749,72 @@
Bold
1
-
+
+
+
+ Button
+
+ SelectSlideArrowLeft
+
+ SelectSlideArrowRight
+
+ SelectSlide
+
+ SelectSlideArrowLeft
+
+ SelectSlideArrowRight
+
+ SelectSlide
+
+ 40
+ 230
+ -2,11
+ 360
+ 40
+
+ 45
+ 235
+ -2,12
+ 30
+ 30
+
+ 365
+ 235
+ -2,12
+ 30
+ 30
+
+
+ ButtonColor
+
+
+ ButtonSColor
+
+
+ SelectSlideHColor
+
+
+ ArrowColor
+
+
+ ArrowSColor
+
+
+ TextColor
+
+
+ TextSColor
+
+ 30,00
+
+ 280,00
+
+ Outline
+
+ Bold
+
+ 1
+
CoverTile
diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs
index 9b36d03d..d50d391d 100644
--- a/Vocaluxe/Screens/CScreenSong.cs
+++ b/Vocaluxe/Screens/CScreenSong.cs
@@ -17,6 +17,13 @@ namespace Vocaluxe.Screens
{
class CScreenSong : CMenu
{
+ enum ESongOptionsView
+ {
+ None,
+ Song,
+ General
+ }
+
// Version number for theme files. Increment it, if you've changed something on the theme files!
const int ScreenVersion = 3;
@@ -26,12 +33,18 @@ namespace Vocaluxe.Screens
private const string TextSearchBar = "TextSearchBar";
private const string TextOptionsTitle = "TextOptionsTitle";
+ private const string ButtonOpenOptions = "ButtonOpenOptions";
private const string ButtonOptionsSing = "ButtonOptionsSing";
private const string ButtonOptionsPlaylist = "ButtonOptionsPlaylist";
private const string ButtonOptionsClose = "ButtonOptionsClose";
+ private const string ButtonOptionsRandom = "ButtonOptionsRandom";
+ private const string ButtonOptionsSingAll = "ButtonOptionsSingAll";
+ private const string ButtonOptionsSingAllVisible = "ButtonOptionsSingAllVisible";
+ private const string ButtonOptionsOpenPlaylist = "ButtonOptionsOpenPlaylist";
private const string SelectSlideOptionsMode = "SelectSlideOptionsMode";
- private const string SelectSlideOptionsPlaylist = "SelectSlideOptionsPlaylist";
+ private const string SelectSlideOptionsPlaylistAdd = "SelectSlideOptionsPlaylistAdd";
+ private const string SelectSlideOptionsPlaylistOpen = "SelectSlideOptionsPlaylistOpen";
private const string StaticSearchBar = "StaticSearchBar";
private const string StaticOptionsBG = "StaticOptionsBG";
@@ -60,8 +73,8 @@ namespace Vocaluxe.Screens
_ScreenVersion = ScreenVersion;
_ThemeStatics = new string[] { StaticSearchBar, StaticOptionsBG };
_ThemeTexts = new string[] { TextCategory, TextSelection, TextSearchBarTitle, TextSearchBar, TextOptionsTitle };
- _ThemeButtons = new string[] { ButtonOptionsClose, ButtonOptionsPlaylist, ButtonOptionsSing };
- _ThemeSelectSlides = new string[] { SelectSlideOptionsMode, SelectSlideOptionsPlaylist };
+ _ThemeButtons = new string[] { ButtonOptionsClose, ButtonOptionsPlaylist, ButtonOptionsSing, ButtonOptionsRandom, ButtonOptionsSingAll, ButtonOptionsSingAllVisible, ButtonOptionsOpenPlaylist, ButtonOpenOptions };
+ _ThemeSelectSlides = new string[] { SelectSlideOptionsMode, SelectSlideOptionsPlaylistAdd, SelectSlideOptionsPlaylistOpen };
_ThemeSongMenus = new string[] { SongMenu };
_ThemePlaylists = new string[] { Playlist };
}
@@ -70,10 +83,15 @@ namespace Vocaluxe.Screens
{
base.LoadTheme();
SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Visible = false;
- SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Visible = false;
+ SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].Visible = false;
+ SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistOpen)].Visible = false;
Buttons[htButtons(ButtonOptionsClose)].Visible = false;
Buttons[htButtons(ButtonOptionsSing)].Visible = false;
Buttons[htButtons(ButtonOptionsPlaylist)].Visible = false;
+ Buttons[htButtons(ButtonOptionsRandom)].Visible = false;
+ Buttons[htButtons(ButtonOptionsSingAll)].Visible = false;
+ Buttons[htButtons(ButtonOptionsSingAllVisible)].Visible = false;
+ Buttons[htButtons(ButtonOptionsOpenPlaylist)].Visible = false;
Texts[htTexts(TextOptionsTitle)].Visible = false;
Statics[htStatics(StaticOptionsBG)].Visible = false;
Playlists[htPlaylists(Playlist)].Visible = false;
@@ -129,7 +147,7 @@ namespace Vocaluxe.Screens
if (CSongs.NumVisibleSongs > 0)
{
if (SongMenus[htSongMenus(SongMenu)].GetSelectedSong() != -1 && !_SongOptionsActive)
- ToggleSongOptions();
+ ToggleSongOptions(ESongOptionsView.Song);
}
break;
@@ -153,6 +171,10 @@ namespace Vocaluxe.Screens
break;
+ case Keys.Space:
+ ToggleSongOptions(ESongOptionsView.General);
+ break;
+
case Keys.F3:
if (_SearchActive)
{
@@ -166,7 +188,7 @@ namespace Vocaluxe.Screens
}
break;
- //TODO: Move that to the new menu and delete it!
+ //TODO: Delete it! ??? Shouldn't we keep this as shortcut?
case Keys.A:
if (!_SearchActive && KeyEvent.Mod == Modifier.None)
{
@@ -219,14 +241,33 @@ namespace Vocaluxe.Screens
case Keys.Enter:
if (Buttons[htButtons(ButtonOptionsClose)].Selected)
{
- ToggleSongOptions();
+ ToggleSongOptions(ESongOptionsView.None);
}
else if (Buttons[htButtons(ButtonOptionsSing)].Selected)
{
- ToggleSongOptions();
+ ToggleSongOptions(ESongOptionsView.None);
StartSong(SongMenus[htSongMenus(SongMenu)].GetSelectedSong());
}
else if (Buttons[htButtons(ButtonOptionsPlaylist)].Selected)
+ {
+ OpenAndAddPlaylistAction();
+ }
+ else if (Buttons[htButtons(ButtonOptionsRandom)].Selected)
+ {
+ if (CSongs.Category != -1)
+ {
+ SongMenus[htSongMenus(SongMenu)].SetSelectedSong(CSongs.GetRandomSong());
+ }
+ }
+ else if (Buttons[htButtons(ButtonOptionsSingAll)].Selected)
+ {
+ StartRandomAllSongs();
+ }
+ else if (Buttons[htButtons(ButtonOptionsSingAllVisible)].Selected)
+ {
+ StartRandomVisibleSongs();
+ }
+ else if (Buttons[htButtons(ButtonOptionsOpenPlaylist)].Selected)
{
OpenPlaylistAction();
}
@@ -234,7 +275,8 @@ namespace Vocaluxe.Screens
case Keys.Escape:
case Keys.Back:
- ToggleSongOptions();
+ case Keys.Space:
+ ToggleSongOptions(ESongOptionsView.None);
break;
}
}
@@ -270,7 +312,7 @@ namespace Vocaluxe.Screens
CGraphics.FadeTo(EScreens.ScreenMain);
}
else if (MouseEvent.RB && _SongOptionsActive)
- ToggleSongOptions();
+ ToggleSongOptions(ESongOptionsView.None);
if (MouseEvent.MB && CSongs.Category != -1)
{
@@ -284,7 +326,14 @@ namespace Vocaluxe.Screens
{
if (SongMenus[htSongMenus(SongMenu)].GetSelectedSong() != -1 && !_SongOptionsActive)
{
- ToggleSongOptions();
+ ToggleSongOptions(ESongOptionsView.Song);
+ }
+ }
+ else if (MouseEvent.LB && IsMouseOver(MouseEvent))
+ {
+ if (Buttons[htButtons(ButtonOpenOptions)].Selected)
+ {
+ ToggleSongOptions(ESongOptionsView.General);
}
}
}
@@ -295,21 +344,42 @@ namespace Vocaluxe.Screens
{
if (Buttons[htButtons(ButtonOptionsClose)].Selected)
{
- ToggleSongOptions();
+ ToggleSongOptions(ESongOptionsView.None);
}
else if (Buttons[htButtons(ButtonOptionsSing)].Selected)
{
- ToggleSongOptions();
+ ToggleSongOptions(ESongOptionsView.None);
StartSong(SongMenus[htSongMenus(SongMenu)].GetSelectedSong());
}
else if (Buttons[htButtons(ButtonOptionsPlaylist)].Selected)
+ {
+ OpenAndAddPlaylistAction();
+ }
+ else if (Buttons[htButtons(ButtonOptionsRandom)].Selected)
+ {
+ if (CSongs.Category != -1)
+ {
+ SongMenus[htSongMenus(SongMenu)].SetSelectedSong(CSongs.GetRandomSong());
+ }
+ }
+ else if (Buttons[htButtons(ButtonOptionsSingAll)].Selected)
+ {
+ ToggleSongOptions(ESongOptionsView.None);
+ StartRandomAllSongs();
+ }
+ else if (Buttons[htButtons(ButtonOptionsSingAllVisible)].Selected)
+ {
+ ToggleSongOptions(ESongOptionsView.None);
+ StartRandomVisibleSongs();
+ }
+ else if (Buttons[htButtons(ButtonOptionsOpenPlaylist)].Selected)
{
OpenPlaylistAction();
}
}
if (MouseEvent.RB)
{
- ToggleSongOptions();
+ ToggleSongOptions(ESongOptionsView.None);
}
}
@@ -534,55 +604,71 @@ namespace Vocaluxe.Screens
SongMenus[htSongMenus(SongMenu)].OnShow();
}
- private void ToggleSongOptions()
+ private void ToggleSongOptions(ESongOptionsView view)
{
_SongOptionsActive = !_SongOptionsActive;
if (_SongOptionsActive)
{
- EGameMode LastMode = EGameMode.TR_GAMEMODE_NORMAL;
- if (_AvailableGameModes.Count > 0)
- LastMode = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
- SetInteractionToButton(Buttons[htButtons(ButtonOptionsSing)]);
- _AvailableGameModes.Clear();
- SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Clear();
- if (!CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
+ if (view == ESongOptionsView.Song)
{
- SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_NORMAL));
- _AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_NORMAL);
- SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_SHORTSONG));
- _AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_SHORTSONG);
+ EGameMode LastMode = EGameMode.TR_GAMEMODE_NORMAL;
+ if (_AvailableGameModes.Count > 0)
+ LastMode = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
+ SetInteractionToButton(Buttons[htButtons(ButtonOptionsSing)]);
+ _AvailableGameModes.Clear();
+ SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Clear();
+ if (!CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
+ {
+ SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_NORMAL));
+ _AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_NORMAL);
+ SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_SHORTSONG));
+ _AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_SHORTSONG);
+ }
+ if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
+ {
+ SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_DUET));
+ _AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_DUET);
+ }
+ if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].Medley.Source != EMedleySource.None)
+ {
+ SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_MEDLEY));
+ _AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_MEDLEY);
+ }
+ //Set SelectSlide-Selection to last selected game-mode if possible
+ for (int i = 0; i < _AvailableGameModes.Count; i++)
+ {
+ if (_AvailableGameModes[i] == LastMode)
+ SelectSlides[htSelectSlides(SelectSlideOptionsMode)].SetSelectionByValueIndex(i);
+ }
+ SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Visible = true;
+ SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].Visible = true;
+ Buttons[htButtons(ButtonOptionsSing)].Visible = true;
+ Buttons[htButtons(ButtonOptionsPlaylist)].Visible = true;
}
- if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
+ else if (view == ESongOptionsView.General)
{
- SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_DUET));
- _AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_DUET);
+ Buttons[htButtons(ButtonOptionsRandom)].Visible = CSongs.Category != -1;
+ Buttons[htButtons(ButtonOptionsSingAll)].Visible = true;
+ Buttons[htButtons(ButtonOptionsSingAllVisible)].Visible = true;
+ Buttons[htButtons(ButtonOptionsOpenPlaylist)].Visible = true;
+ SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistOpen)].Visible = true;
}
- if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].Medley.Source != EMedleySource.None)
- {
- SelectSlides[htSelectSlides(SelectSlideOptionsMode)].AddValue(Enum.GetName(typeof(GameModes.EGameMode), GameModes.EGameMode.TR_GAMEMODE_MEDLEY));
- _AvailableGameModes.Add(GameModes.EGameMode.TR_GAMEMODE_MEDLEY);
- }
- //Set SelectSlide-Selection to last selected game-mode if possible
- for (int i = 0; i < _AvailableGameModes.Count; i++)
- {
- if (_AvailableGameModes[i] == LastMode)
- SelectSlides[htSelectSlides(SelectSlideOptionsMode)].SetSelectionByValueIndex(i);
- }
- SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Visible = true;
- SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Visible = true;
Buttons[htButtons(ButtonOptionsClose)].Visible = true;
- Buttons[htButtons(ButtonOptionsSing)].Visible = true;
- Buttons[htButtons(ButtonOptionsPlaylist)].Visible = true;
Texts[htTexts(TextOptionsTitle)].Visible = true;
Statics[htStatics(StaticOptionsBG)].Visible = true;
}
else
{
SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Visible = false;
- SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Visible = false;
+ SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].Visible = false;
+ SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistOpen)].Visible = false;
Buttons[htButtons(ButtonOptionsClose)].Visible = false;
Buttons[htButtons(ButtonOptionsSing)].Visible = false;
Buttons[htButtons(ButtonOptionsPlaylist)].Visible = false;
+ Buttons[htButtons(ButtonOptionsRandom)].Visible = false;
+ Buttons[htButtons(ButtonOptionsSingAll)].Visible = false;
+ Buttons[htButtons(ButtonOptionsSingAllVisible)].Visible = false;
+ Buttons[htButtons(ButtonOptionsOpenPlaylist)].Visible = false;
Texts[htTexts(TextOptionsTitle)].Visible = false;
Statics[htStatics(StaticOptionsBG)].Visible = false;
}
@@ -614,15 +700,29 @@ namespace Vocaluxe.Screens
private void UpdatePlaylistNames()
{
- SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Clear();
- SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].AddValue("TR_SCREENSONG_NEWPLAYLIST");
- SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].AddValues(CPlaylists.PlaylistNames);
+ SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].Clear();
+ SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].AddValue("TR_SCREENSONG_NEWPLAYLIST");
+ SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].AddValues(CPlaylists.PlaylistNames);
+ SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistOpen)].Clear();
+ SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistOpen)].AddValues(CPlaylists.PlaylistNames);
}
private void OpenPlaylistAction()
+ {
+ //Open a playlist
+ if (Playlists[htPlaylists(Playlist)].ActivePlaylistID != (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistOpen)].Selection))
+ {
+ Playlists[htPlaylists(Playlist)].ActivePlaylistID = SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistOpen)].Selection;
+ //Open playlist
+ OpenPlaylist(Playlists[htPlaylists(Playlist)].ActivePlaylistID);
+ }
+ ToggleSongOptions(ESongOptionsView.None);
+ }
+
+ private void OpenAndAddPlaylistAction()
{
//Open a playlist and add song
- if (Playlists[htPlaylists(Playlist)].ActivePlaylistID != (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Selection - 1))
+ if (Playlists[htPlaylists(Playlist)].ActivePlaylistID != (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].Selection - 1))
{
//Check selected game-mode
EGameMode gm;
@@ -634,17 +734,17 @@ namespace Vocaluxe.Screens
else
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
//Check if Playlist really exists
- if (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Selection - 1 < 0)
+ if (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].Selection - 1 < 0)
Playlists[htPlaylists(Playlist)].ActivePlaylistID = CPlaylists.NewPlaylist();
else
- Playlists[htPlaylists(Playlist)].ActivePlaylistID = SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Selection - 1;
+ Playlists[htPlaylists(Playlist)].ActivePlaylistID = SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].Selection - 1;
//Add song to playlist
CPlaylists.Playlists[Playlists[htPlaylists(Playlist)].ActivePlaylistID].AddSong(CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].ID, gm);
//Open playlist
OpenPlaylist(Playlists[htPlaylists(Playlist)].ActivePlaylistID);
}
//Create a new playlist and add song
- else if ((SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Selection - 1) == -1)
+ else if ((SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].Selection - 1) == -1)
{
//Check selected game-mode
EGameMode gm;
@@ -662,7 +762,7 @@ namespace Vocaluxe.Screens
//Open playlist
OpenPlaylist(Playlists[htPlaylists(Playlist)].ActivePlaylistID);
//Add new playlist to select-slide
- SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].AddValue(CPlaylists.Playlists[Playlists[htPlaylists(Playlist)].ActivePlaylistID].PlaylistName);
+ SelectSlides[htSelectSlides(SelectSlideOptionsPlaylistAdd)].AddValue(CPlaylists.Playlists[Playlists[htPlaylists(Playlist)].ActivePlaylistID].PlaylistName);
}
//Add song to loaded playlist
@@ -680,7 +780,7 @@ namespace Vocaluxe.Screens
CPlaylists.Playlists[Playlists[htPlaylists(Playlist)].ActivePlaylistID].AddSong(CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].ID, gm);
Playlists[htPlaylists(Playlist)].UpdatePlaylist();
}
- ToggleSongOptions();
+ ToggleSongOptions(ESongOptionsView.Song);
}
}
}