some code reorganization

VocaluxeLib/PartyModes/CPartyMode.cs

@@ -8,7 +8,6 @@ namespace Vocaluxe.PartyModes
 {
     public abstract class CPartyMode : IPartyMode
     {
-        protected Basic _Base;
         protected ScreenSongOptions _ScreenSongOptions;
         protected Dictionary<string, CMenuParty> _Screens;
         protected string _Folder;
@@ -28,9 +27,8 @@ namespace Vocaluxe.PartyModes
             return false;
         }
 
-        public void Initialize(Basic Base)
+        public void Initialize()
         {
-            _Base = Base;
         }
 
         public void AddScreen(CMenuParty Screen, string ScreenName)
@@ -122,17 +120,17 @@ namespace Vocaluxe.PartyModes
 
         public virtual void FinishedSinging()
         {
-            _Base.Graphics.FadeTo(EScreens.ScreenScore);
+            CBase.Graphics.FadeTo(EScreens.ScreenScore);
         }
 
         public virtual void LeavingScore()
         {
-            _Base.Graphics.FadeTo(EScreens.ScreenHighscore);
+            CBase.Graphics.FadeTo(EScreens.ScreenHighscore);
         }
 
         public virtual void LeavingHighscore()
         {
-            _Base.Graphics.FadeTo(EScreens.ScreenSong);
+            CBase.Graphics.FadeTo(EScreens.ScreenSong);
         }
         #endregion Implementation
     }

VocaluxeLib/PartyModes/CPartyModeNone.cs

@@ -25,13 +25,13 @@ namespace Vocaluxe.PartyModes
 
         public override ScreenSongOptions GetScreenSongOptions()
         {
-            _ScreenSongOptions.Sorting.SongSorting = _Base.Config.GetSongSorting();
-            _ScreenSongOptions.Sorting.Tabs = _Base.Config.GetTabs();
+            _ScreenSongOptions.Sorting.SongSorting = CBase.Config.GetSongSorting();
+            _ScreenSongOptions.Sorting.Tabs = CBase.Config.GetTabs();
 
             if (_ScreenSongOptions.Sorting.SearchActive)
                 _ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_OFF;
 
-            _ScreenSongOptions.Sorting.IgnoreArticles = _Base.Config.GetIgnoreArticles();
+            _ScreenSongOptions.Sorting.IgnoreArticles = CBase.Config.GetIgnoreArticles();
 
             return _ScreenSongOptions;
         }

VocaluxeLib/PartyModes/IPartyMode.cs

@@ -68,7 +68,7 @@ namespace Vocaluxe.PartyModes
     public interface IPartyMode
     {
         bool Init();
-        void Initialize(Basic Base);
+        void Initialize();
         void AddScreen(CMenuParty Screen, string ScreenName);
         void DataFromScreen(string ScreenName, Object Data);