Merge branch 'develop' of github.com:Flamefire/Vocaluxe into sound-player

Conflicts:
	PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

PartyModes/PartyModeChallenge/CPartyModeChallenge.cs

@@ -270,7 +270,7 @@ namespace VocaluxeLib.PartyModes.Challenge
         public override void UpdateGame()
         {
             /*
-            if (CBase.Songs.GetCurrentCategoryIndex() != -1 || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)
+            if (CBase.Songs.IsInCategory() || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)
                 _ScreenSongOptions.Selection.RandomOnly = true;
             else
                 _ScreenSongOptions.Selection.RandomOnly = false;*/
@@ -475,12 +475,12 @@ namespace VocaluxeLib.PartyModes.Challenge
                     players[i].ProfileID = -1;
             }
 
-            CBase.Songs.AddPartySongSung(songID);
             CBase.Graphics.FadeTo(EScreens.ScreenSing);
         }
 
         public override void LeavingHighscore()
         {
+            CBase.Songs.AddPartySongSung(CBase.Game.GetSong(0).ID);
             _GameData.CurrentRoundNr++;
             CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
         }

PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs

@@ -275,7 +275,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
         public override void UpdateGame()
         {
             /*
-            if (CBase.Songs.GetCurrentCategoryIndex() != -1 || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)
+            if (CBase.Songs.IsInCategory() || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)
                 _ScreenSongOptions.Selection.RandomOnly = true;
             else
                 _ScreenSongOptions.Selection.RandomOnly = false;*/
@@ -457,6 +457,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
 
         public override void LeavingHighscore()
         {
+            for (int i = 0; i < CBase.Game.GetNumSongs();i++ )
+                CBase.Songs.AddPartySongSung(CBase.Game.GetSong(i).ID);
             _GameData.CurrentRoundNr++;
             CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
         }
@@ -542,7 +544,6 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
             {
                 int songID = ids[CBase.Game.GetRandom(ids.Count)];
                 CBase.Game.AddSong(songID, EGameMode.TR_GAMEMODE_MEDLEY);
-                CBase.Songs.AddPartySongSung(songID);
                 ids.Remove(songID);
                 s++;
             }

PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs

@@ -329,7 +329,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
         public override void UpdateGame()
         {
             /*
-            if (CBase.Songs.GetCurrentCategoryIndex() != -1 || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)
+            if (CBase.Songs.IsInCategory() || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)
                 _ScreenSongOptions.Selection.RandomOnly = true;
             else
                 _ScreenSongOptions.Selection.RandomOnly = false;*/
@@ -515,12 +515,12 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             }
             CBase.Game.AddSong(songID, gm);
 
-            CBase.Songs.AddPartySongSung(songID);
             CBase.Graphics.FadeTo(EScreens.ScreenSing);
         }
 
         public override void LeavingHighscore()
         {
+            CBase.Songs.AddPartySongSung(CBase.Game.GetSong(0).ID);
             _UpdateScores();
             CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
         }
@@ -655,9 +655,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                 switch (_GameData.SongSource)
                 {
                     case ESongSource.TR_PLAYLIST:
-                        for (int i = 0; i < CBase.Playlist.GetPlaylistSongCount(_GameData.PlaylistID); i++)
+                        for (int i = 0; i < CBase.Playlist.GetSongCount(_GameData.PlaylistID); i++)
                         {
-                            int id = CBase.Playlist.GetPlaylistSong(_GameData.PlaylistID, i).SongID;
+                            int id = CBase.Playlist.GetSong(_GameData.PlaylistID, i).SongID;
                             // ReSharper disable LoopCanBeConvertedToQuery
                             foreach (EGameMode mode in CBase.Songs.GetSongByID(id).AvailableGameModes)
                                 // ReSharper restore LoopCanBeConvertedToQuery

PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeConfig.cs

@@ -180,11 +180,11 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             _SelectSlides[_SelectSlideSongSource].Clear();
             _SelectSlides[_SelectSlideSongSource].SetValues<ESongSource>((int)_Data.ScreenConfig.SongSource);
 
-            List<string> playlists = CBase.Playlist.GetPlaylistNames();
+            List<string> playlists = CBase.Playlist.GetNames();
             _SelectSlides[_SelectSlidePlaylist].Clear();
             for (int i = 0; i < playlists.Count; i++)
             {
-                string value = playlists[i] + " (" + CBase.Playlist.GetPlaylistSongCount(i) + " " + CBase.Language.Translate("TR_SONGS", _PartyModeID) + ")";
+                string value = playlists[i] + " (" + CBase.Playlist.GetSongCount(i) + " " + CBase.Language.Translate("TR_SONGS", _PartyModeID) + ")";
                 _SelectSlides[_SelectSlidePlaylist].AddValue(value);
             }
             _SelectSlides[_SelectSlidePlaylist].Selection = _Data.ScreenConfig.PlaylistID;
@@ -241,12 +241,12 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             {
                 if (CBase.Playlist.GetNumPlaylists() > 0)
                 {
-                    if (CBase.Playlist.GetPlaylistSongCount(_Data.ScreenConfig.PlaylistID) > 0)
+                    if (CBase.Playlist.GetSongCount(_Data.ScreenConfig.PlaylistID) > 0)
                     {
                         _ConfigOk = false;
-                        for (int i = 0; i < CBase.Playlist.GetPlaylistSongCount(_Data.ScreenConfig.PlaylistID); i++)
+                        for (int i = 0; i < CBase.Playlist.GetSongCount(_Data.ScreenConfig.PlaylistID); i++)
                         {
-                            int id = CBase.Playlist.GetPlaylistSong(_Data.ScreenConfig.PlaylistID, i).SongID;
+                            int id = CBase.Playlist.GetSong(_Data.ScreenConfig.PlaylistID, i).SongID;
                             _ConfigOk = CBase.Songs.GetSongByID(id).AvailableGameModes.Any(mode => mode == gm);
                             if (_ConfigOk)
                                 break;

PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs

@@ -378,7 +378,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
         public override void OnClose()
         {
             base.OnClose();
-            CBase.BackgroundMusic.SetStatus(false);
+            CBase.BackgroundMusic.SetDisabled(false);
             CBase.Sound.Fade(_PreviewStream, 0f, 0.5f, EStreamAction.Close);
         }
 
@@ -501,7 +501,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             }
             CSong song = CBase.Songs.GetSongByID(songID);
 
-            CBase.BackgroundMusic.SetStatus(true);
+            CBase.BackgroundMusic.SetDisabled(true);
 
             _PreviewStream = CBase.Sound.Load(song.GetMP3());
             CBase.Sound.SetPosition(_PreviewStream, song.Preview.StartTime);
@@ -525,7 +525,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
         {
             int songID = _Fields[_SelectedField].Content.SongID;
             CSong song = CBase.Songs.GetSongByID(songID);
-            CBase.BackgroundMusic.SetStatus(true);
+            CBase.BackgroundMusic.SetDisabled(true);
 
             _PreviewStream = CBase.Sound.Load(song.GetMP3());
             CBase.Sound.SetPosition(_PreviewStream, song.Preview.StartTime);