Fix blank screen issue

Also fix some other bugs and improvements (easier party modes, volume fixes, new fields for screens to control volume and popups)

VocaluxeLib/Menu/CMenu.cs

@@ -112,11 +112,6 @@ namespace VocaluxeLib.Menu
             _ThemeScreenSettings = null;
         }
 
-        protected static void _FadeTo(EScreens nextScreen)
-        {
-            CBase.Graphics.FadeTo(nextScreen);
-        }
-
         #region ThemeHandler
         protected override void _ClearElements()
         {
@@ -569,6 +564,11 @@ namespace VocaluxeLib.Menu
             get { return CBase.Settings.GetRenderRect(); }
         }
 
+        public virtual EMusicType CurrentMusicType
+        {
+            get { return EMusicType.Background; }
+        }
+
         protected void _ResumeBG()
         {
             foreach (CBackground bg in _Backgrounds)

VocaluxeLib/Menu/CMenuParty.cs

@@ -29,7 +29,5 @@ namespace VocaluxeLib.Menu
             _PartyMode = partyMode;
             PartyModeID = partyMode.ID;
         }
-
-        public virtual void DataToScreen(Object data) {}
     }
 }

VocaluxeLib/Menu/CMenuPartyNameSelection.cs

@@ -22,12 +22,6 @@ using VocaluxeLib.Profile;
 
 namespace VocaluxeLib.Menu
 {
-    public struct SPartyNameOptions
-    {
-        public int[] NumPlayerTeams;
-        public List<int>[] TeamList;
-    }
-
     public abstract class CMenuPartyNameSelection : CMenuParty
     {
         private bool _Teams;
@@ -63,7 +57,7 @@ namespace VocaluxeLib.Menu
         private const string _SelectSlidePlayer = "SelectSlidePlayer";
         private const string _NameSelection = "NameSelection";
 
-        private List<int>[] _TeamList;
+        protected List<int>[] _TeamList;
 
         public override void Init()
         {
@@ -558,12 +552,6 @@ namespace VocaluxeLib.Menu
         public abstract void Back();
         public abstract void Next();
 
-        public SPartyNameOptions GetData()
-        {
-            SPartyNameOptions option = new SPartyNameOptions {NumPlayerTeams = _NumPlayerTeams, TeamList = _TeamList};
-            return option;
-        }
-
         public void IncreaseTeamNum()
         {
             if (!_AllowChangeTeamNum)

VocaluxeLib/Menu/CNameSelection.cs

@@ -140,8 +140,10 @@ namespace VocaluxeLib.Menu
         {
             _PrepareTiles();
 
-            _PlayerSelector = new CStatic(_PartyModeID, _TextureTileSelected, new SColorF(), new SRectF(0, 0, _Theme.Tiles.W + 6, _Theme.Tiles.H + 6, Rect.Z - 0.5f));
-            _PlayerSelector.Visible = false;
+            _PlayerSelector = new CStatic(_PartyModeID, _TextureTileSelected, new SColorF(), new SRectF(0, 0, _Theme.Tiles.W + 6, _Theme.Tiles.H + 6, Rect.Z - 0.5f))
+                {
+                    Visible = false
+                };
 
             _UpdateVisibleProfiles();
 

VocaluxeLib/Menu/CPlaylist.cs

@@ -1112,7 +1112,7 @@ namespace VocaluxeLib.Menu
                 for (int i = 0; i < CBase.Playlist.GetSongCount(ActivePlaylistID); i++)
                     CBase.Game.AddSong(CBase.Playlist.GetSong(ActivePlaylistID, i).SongID, CBase.Playlist.GetSong(ActivePlaylistID, i).GameMode);
                 if (CBase.Game.GetNumSongs() > 0)
-                    CBase.Graphics.FadeTo(EScreens.ScreenNames);
+                    CBase.Graphics.FadeTo(EScreen.Names);
             }
         }
 
@@ -1124,7 +1124,7 @@ namespace VocaluxeLib.Menu
             CBase.Game.AddSong(CBase.Playlist.GetSong(ActivePlaylistID, selected).SongID, CBase.Playlist.GetSong(ActivePlaylistID, selected).GameMode);
 
             if (CBase.Game.GetNumSongs() > 0)
-                CBase.Graphics.FadeTo(EScreens.ScreenNames);
+                CBase.Graphics.FadeTo(EScreen.Names);
         }
 
         private void _Update()

VocaluxeLib/Menu/IMenu.cs

@@ -42,6 +42,10 @@ namespace VocaluxeLib.Menu
         void OnClose();
 
         SRectF ScreenArea { get; }
+        /// <summary>
+        ///     Type of currently playing music
+        /// </summary>
+        EMusicType CurrentMusicType { get; }
 
         void NextElement();
         void PrevElement();

VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

@@ -243,7 +243,7 @@ namespace VocaluxeLib.Menu.SongMenu
 
         public virtual void OnHide()
         {
-            if (CBase.Graphics.GetNextScreen() != EScreens.ScreenNames || CBase.Config.GetBackgroundMusicStatus() == EBackgroundMusicOffOn.TR_CONFIG_OFF)
+            if (CBase.Graphics.GetNextScreenType() != EScreen.Names || CBase.Config.GetBackgroundMusicStatus() == EBackgroundMusicOffOn.TR_CONFIG_OFF)
                 _ResetPreview();
         }
 

VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -454,7 +454,7 @@ namespace VocaluxeLib.Menu.SongMenu
                 }
                 if (CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_OFF && !songOptions.Selection.PartyMode)
                 {
-                    CBase.Graphics.FadeTo(EScreens.ScreenMain);
+                    CBase.Graphics.FadeTo(EScreen.Main);
                     return true;
                 }
             }