Using null instead of CTexture(-1) for "no texture"

VocaluxeLib/Menu/SongMenu/CCategory.cs

@@ -25,9 +25,8 @@ namespace VocaluxeLib.Menu.SongMenu
     public class CCategory
     {
         public readonly string Name;
-        private CTexture _CoverTextureSmall = new CTexture(-1);
-        private CTexture _CoverTextureBig = new CTexture(-1);
-        private bool _CoverBigLoaded;
+        private CTexture _CoverTextureSmall;
+        private CTexture _CoverTextureBig;
         public readonly List<CSongPointer> Songs = new List<CSongPointer>();
 
         public CCategory(string name)
@@ -44,13 +43,12 @@ namespace VocaluxeLib.Menu.SongMenu
 
         public CTexture CoverTextureBig
         {
-            get { return _CoverBigLoaded ? _CoverTextureBig : _CoverTextureSmall; }
+            get { return _CoverTextureBig ?? _CoverTextureSmall; }
             set
             {
                 if (value.Index == -1)
                     return;
                 _CoverTextureBig = value;
-                _CoverBigLoaded = true;
             }
         }
 

VocaluxeLib/Menu/SongMenu/CSong.cs

@@ -70,10 +70,8 @@ namespace VocaluxeLib.Menu.SongMenu
 
     public class CSong
     {
-        private bool _CoverSmallLoaded;
-        private bool _CoverBigLoaded;
-        private CTexture _CoverTextureSmall = new CTexture(-1);
-        private CTexture _CoverTextureBig = new CTexture(-1);
+        private CTexture _CoverTextureSmall;
+        private CTexture _CoverTextureBig;
 
         public SMedley Medley;
 
@@ -101,26 +99,18 @@ namespace VocaluxeLib.Menu.SongMenu
         {
             get
             {
-                if (!_CoverSmallLoaded)
+                if (_CoverTextureSmall == null)
                     LoadSmallCover();
                 return _CoverTextureSmall;
             }
 
-            set
-            {
-                _CoverTextureSmall = value;
-                _CoverSmallLoaded = true;
-            }
+            set { _CoverTextureSmall = value; }
         }
 
         public CTexture CoverTextureBig
         {
-            get { return _CoverBigLoaded ? _CoverTextureBig : _CoverTextureSmall; }
-            set
-            {
-                _CoverTextureBig = value;
-                _CoverBigLoaded = true;
-            }
+            get { return _CoverTextureBig ?? _CoverTextureSmall; }
+            set { _CoverTextureBig = value; }
         }
 
         public string Title = String.Empty;
@@ -215,8 +205,6 @@ namespace VocaluxeLib.Menu.SongMenu
             VideoFileName = song.VideoFileName;
 
             VideoAspect = song.VideoAspect;
-            _CoverSmallLoaded = song._CoverSmallLoaded;
-            _CoverBigLoaded = song._CoverBigLoaded;
             NotesLoaded = song.NotesLoaded;
 
             Artist = song.Artist;
@@ -751,7 +739,7 @@ namespace VocaluxeLib.Menu.SongMenu
 
         public void LoadSmallCover()
         {
-            if (_CoverSmallLoaded)
+            if (_CoverTextureSmall != null)
                 return;
             if (CoverFileName != "")
             {
@@ -760,8 +748,6 @@ namespace VocaluxeLib.Menu.SongMenu
             }
             else
                 _CoverTextureSmall = CBase.Cover.GetNoCover();
-
-            _CoverSmallLoaded = true;
         }
 
         private void _CheckFiles()

VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

@@ -105,7 +105,7 @@ namespace VocaluxeLib.Menu.SongMenu
         private readonly List<int> _Streams = new List<int>();
         private int _Actsong = -1;
         private int _Actsongstream = -1;
-        protected CTexture _Vidtex = new CTexture(-1);
+        protected CTexture _Vidtex;
 
         protected bool _Initialized;
         protected int _LastKnownNumSongs;
@@ -464,7 +464,7 @@ namespace VocaluxeLib.Menu.SongMenu
         public virtual void OnShow()
         {
             _Actsongstream = -1;
-            _Vidtex = new CTexture(-1);
+            _Vidtex = null;
         }
 
         public virtual void OnHide()

VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -453,8 +453,7 @@ namespace VocaluxeLib.Menu.SongMenu
 
             _TextBG.Draw();
 
-
-            if (_Vidtex.Index != -1 && _Video != -1)
+            if (_Vidtex != null && _Video != -1)
             {
                 if (_Vidtex.Color.A < 1)
                     _CoverBig.Draw(1f, EAspect.Crop);