Fixed and changed category handling and visible songs

VocaluxeLib/Menu/SongMenu/CSong.cs

@@ -26,6 +26,19 @@ using VocaluxeLib.Menu.SingNotes;
 
 namespace VocaluxeLib.Menu.SongMenu
 {
+    public class CSongPointer
+    {
+        public readonly int SongID;
+        public string SortString;
+        public bool IsSung;
+
+        public CSongPointer(int id, string sortString)
+        {
+            SongID = id;
+            SortString = sortString;
+        }
+    }
+
     [Flags]
     enum EHeaderFlags
     {
@@ -40,58 +53,11 @@ namespace VocaluxeLib.Menu.SongMenu
 
     public enum EMedleySource
     {
-        None,
+        None = 0,
         Calculated,
         Tag
     }
 
-    public class CCategory
-    {
-        public readonly string Name;
-        private STexture _CoverTextureSmall = new STexture(-1);
-        private STexture _CoverTextureBig = new STexture(-1);
-        private bool _CoverBigLoaded;
-
-        public CCategory(string name)
-        {
-            Name = name;
-        }
-
-        public STexture CoverTextureSmall
-        {
-            get { return _CoverTextureSmall; }
-
-            set { _CoverTextureSmall = value; }
-        }
-
-        public STexture CoverTextureBig
-        {
-            get { return _CoverBigLoaded ? _CoverTextureBig : _CoverTextureSmall; }
-            set
-            {
-                if (value.Index != -1)
-                {
-                    _CoverTextureBig = value;
-                    _CoverBigLoaded = true;
-                }
-            }
-        }
-
-        public CCategory(string name, STexture coverSmall, STexture coverBig)
-        {
-            Name = name;
-            CoverTextureSmall = coverSmall;
-            CoverTextureBig = coverBig;
-        }
-
-        public CCategory(CCategory cat)
-        {
-            Name = cat.Name;
-            CoverTextureSmall = cat.CoverTextureSmall;
-            CoverTextureBig = cat.CoverTextureBig;
-        }
-    }
-
     public struct SMedley
     {
         public EMedleySource Source;
@@ -99,17 +65,6 @@ namespace VocaluxeLib.Menu.SongMenu
         public int EndBeat;
         public float FadeInTime;
         public float FadeOutTime;
-
-        // ReSharper disable UnusedParameter.Local
-        public SMedley(int dummy)
-            // ReSharper restore UnusedParameter.Local
-        {
-            Source = EMedleySource.None;
-            StartBeat = 0;
-            EndBeat = 0;
-            FadeInTime = 0f;
-            FadeOutTime = 0f;
-        }
     }
 
     public class CSong
@@ -119,7 +74,7 @@ namespace VocaluxeLib.Menu.SongMenu
         private STexture _CoverTextureSmall = new STexture(-1);
         private STexture _CoverTextureBig = new STexture(-1);
 
-        public SMedley Medley = new SMedley(0);
+        public SMedley Medley;
 
         public bool CalculateMedley = true;
         public float PreviewStart;
@@ -159,10 +114,7 @@ namespace VocaluxeLib.Menu.SongMenu
 
         public STexture CoverTextureBig
         {
-            get
-            {
-                return _CoverBigLoaded ? _CoverTextureBig : _CoverTextureSmall;
-            }
+            get { return _CoverBigLoaded ? _CoverTextureBig : _CoverTextureSmall; }
             set
             {
                 _CoverTextureBig = value;