Fix adding of new playlist.
This commit is contained in:
1 parent
9907c56909
commit
2d51ad649c
1 file changed
+66
-115
+66
-115
@@ -228,63 +228,7 @@ namespace Vocaluxe.Screens
|
|||||||
}
|
}
|
||||||
else if (Buttons[htButtons(ButtonOptionsPlaylist)].Selected)
|
else if (Buttons[htButtons(ButtonOptionsPlaylist)].Selected)
|
||||||
{
|
{
|
||||||
//Open a playlist and add song
|
OpenPlaylistAction();
|
||||||
if (Playlists[htPlaylists(Playlist)].ActivePlaylistID != (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Selection - 1))
|
|
||||||
{
|
|
||||||
//Check selected game-mode
|
|
||||||
EGameMode gm;
|
|
||||||
if (_AvailableGameModes.Count >= SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection)
|
|
||||||
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
|
||||||
else
|
|
||||||
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
|
||||||
else
|
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
|
||||||
//Check if Playlist really exists
|
|
||||||
if (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Selection - 1 < 0)
|
|
||||||
Playlists[htPlaylists(Playlist)].ActivePlaylistID = CPlaylists.NewPlaylist();
|
|
||||||
else
|
|
||||||
Playlists[htPlaylists(Playlist)].ActivePlaylistID = SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].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)
|
|
||||||
{
|
|
||||||
//Check selected game-mode
|
|
||||||
EGameMode gm;
|
|
||||||
if (_AvailableGameModes.Count >= SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection)
|
|
||||||
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
|
||||||
else
|
|
||||||
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
|
||||||
else
|
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
|
||||||
//Create new playlist
|
|
||||||
Playlists[htPlaylists(Playlist)].ActivePlaylistID = CPlaylists.NewPlaylist();
|
|
||||||
//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);
|
|
||||||
}
|
|
||||||
//Add song to loaded playlist
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//Check selected game-mode
|
|
||||||
EGameMode gm;
|
|
||||||
if (_AvailableGameModes.Count >= SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection)
|
|
||||||
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
|
||||||
else
|
|
||||||
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
|
||||||
else
|
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
|
||||||
CPlaylists.Playlists[Playlists[htPlaylists(Playlist)].ActivePlaylistID].AddSong(CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].ID, gm);
|
|
||||||
Playlists[htPlaylists(Playlist)].UpdatePlaylist();
|
|
||||||
}
|
|
||||||
ToggleSongOptions();
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -360,64 +304,7 @@ namespace Vocaluxe.Screens
|
|||||||
}
|
}
|
||||||
else if (Buttons[htButtons(ButtonOptionsPlaylist)].Selected)
|
else if (Buttons[htButtons(ButtonOptionsPlaylist)].Selected)
|
||||||
{
|
{
|
||||||
//Open a playlist and add song
|
OpenPlaylistAction();
|
||||||
if (Playlists[htPlaylists(Playlist)].ActivePlaylistID != (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Selection - 1))
|
|
||||||
{
|
|
||||||
//Check selected game-mode
|
|
||||||
EGameMode gm;
|
|
||||||
if (_AvailableGameModes.Count >= SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection)
|
|
||||||
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
|
||||||
else
|
|
||||||
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
|
||||||
else
|
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
|
||||||
//Check if playlist really exists
|
|
||||||
if (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Selection - 1 < 0)
|
|
||||||
Playlists[htPlaylists(Playlist)].ActivePlaylistID = CPlaylists.NewPlaylist();
|
|
||||||
else
|
|
||||||
Playlists[htPlaylists(Playlist)].ActivePlaylistID = SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].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)
|
|
||||||
{
|
|
||||||
//Check selected game-mode
|
|
||||||
EGameMode gm;
|
|
||||||
if (_AvailableGameModes.Count >= SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection)
|
|
||||||
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
|
||||||
else
|
|
||||||
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
|
||||||
else
|
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
|
||||||
//Create new playlist
|
|
||||||
Playlists[htPlaylists(Playlist)].ActivePlaylistID = CPlaylists.NewPlaylist();
|
|
||||||
//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);
|
|
||||||
}
|
|
||||||
//Add song to loaded playlist
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//Check selected game-mode
|
|
||||||
EGameMode gm;
|
|
||||||
if (_AvailableGameModes.Count >= SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection)
|
|
||||||
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
|
||||||
else
|
|
||||||
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
|
||||||
else
|
|
||||||
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
|
||||||
//Add song to playlist
|
|
||||||
CPlaylists.Playlists[Playlists[htPlaylists(Playlist)].ActivePlaylistID].AddSong(CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].ID, gm);
|
|
||||||
Playlists[htPlaylists(Playlist)].UpdatePlaylist();
|
|
||||||
}
|
|
||||||
ToggleSongOptions();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (MouseEvent.RB)
|
if (MouseEvent.RB)
|
||||||
@@ -731,5 +618,69 @@ namespace Vocaluxe.Screens
|
|||||||
SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].AddValue("TR_SCREENSONG_NEWPLAYLIST");
|
SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].AddValue("TR_SCREENSONG_NEWPLAYLIST");
|
||||||
SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].AddValues(CPlaylists.PlaylistNames);
|
SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].AddValues(CPlaylists.PlaylistNames);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OpenPlaylistAction()
|
||||||
|
{
|
||||||
|
//Open a playlist and add song
|
||||||
|
if (Playlists[htPlaylists(Playlist)].ActivePlaylistID != (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Selection - 1))
|
||||||
|
{
|
||||||
|
//Check selected game-mode
|
||||||
|
EGameMode gm;
|
||||||
|
if (_AvailableGameModes.Count >= SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection)
|
||||||
|
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
||||||
|
else
|
||||||
|
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
||||||
|
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
||||||
|
else
|
||||||
|
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
||||||
|
//Check if Playlist really exists
|
||||||
|
if (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Selection - 1 < 0)
|
||||||
|
Playlists[htPlaylists(Playlist)].ActivePlaylistID = CPlaylists.NewPlaylist();
|
||||||
|
else
|
||||||
|
Playlists[htPlaylists(Playlist)].ActivePlaylistID = SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].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)
|
||||||
|
{
|
||||||
|
//Check selected game-mode
|
||||||
|
EGameMode gm;
|
||||||
|
if (_AvailableGameModes.Count >= SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection)
|
||||||
|
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
||||||
|
else
|
||||||
|
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
||||||
|
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
||||||
|
else
|
||||||
|
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
||||||
|
//Create new playlist
|
||||||
|
Playlists[htPlaylists(Playlist)].ActivePlaylistID = CPlaylists.NewPlaylist();
|
||||||
|
//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);
|
||||||
|
//Add new playlist to select-slide
|
||||||
|
SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].AddValue(CPlaylists.Playlists[Playlists[htPlaylists(Playlist)].ActivePlaylistID].PlaylistName);
|
||||||
|
|
||||||
|
}
|
||||||
|
//Add song to loaded playlist
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//Check selected game-mode
|
||||||
|
EGameMode gm;
|
||||||
|
if (_AvailableGameModes.Count >= SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection)
|
||||||
|
gm = _AvailableGameModes[SelectSlides[htSelectSlides(SelectSlideOptionsMode)].Selection];
|
||||||
|
else
|
||||||
|
if (CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].IsDuet)
|
||||||
|
gm = GameModes.EGameMode.TR_GAMEMODE_DUET;
|
||||||
|
else
|
||||||
|
gm = GameModes.EGameMode.TR_GAMEMODE_NORMAL;
|
||||||
|
CPlaylists.Playlists[Playlists[htPlaylists(Playlist)].ActivePlaylistID].AddSong(CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].ID, gm);
|
||||||
|
Playlists[htPlaylists(Playlist)].UpdatePlaylist();
|
||||||
|
}
|
||||||
|
ToggleSongOptions();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user