Convert STexture to class CTexture

VocaluxeLib/Menu/SongMenu/CCategory.cs

@@ -18,14 +18,15 @@
 #endregion
 
 using System.Collections.Generic;
+using VocaluxeLib.Draw;
 
 namespace VocaluxeLib.Menu.SongMenu
 {
     public class CCategory
     {
         public readonly string Name;
-        private STexture _CoverTextureSmall = new STexture(-1);
-        private STexture _CoverTextureBig = new STexture(-1);
+        private CTexture _CoverTextureSmall = new CTexture(-1);
+        private CTexture _CoverTextureBig = new CTexture(-1);
         private bool _CoverBigLoaded;
         public readonly List<CSongPointer> Songs = new List<CSongPointer>();
 
@@ -34,14 +35,14 @@ namespace VocaluxeLib.Menu.SongMenu
             Name = name;
         }
 
-        public STexture CoverTextureSmall
+        public CTexture CoverTextureSmall
         {
             get { return _CoverTextureSmall; }
 
             set { _CoverTextureSmall = value; }
         }
 
-        public STexture CoverTextureBig
+        public CTexture CoverTextureBig
         {
             get { return _CoverBigLoaded ? _CoverTextureBig : _CoverTextureSmall; }
             set
@@ -53,7 +54,7 @@ namespace VocaluxeLib.Menu.SongMenu
             }
         }
 
-        public CCategory(string name, STexture coverSmall, STexture coverBig)
+        public CCategory(string name, CTexture coverSmall, CTexture coverBig)
         {
             Name = name;
             CoverTextureSmall = coverSmall;

VocaluxeLib/Menu/SongMenu/CSong.cs

@@ -22,6 +22,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
+using VocaluxeLib.Draw;
 using VocaluxeLib.Menu.SingNotes;
 
 namespace VocaluxeLib.Menu.SongMenu
@@ -71,8 +72,8 @@ namespace VocaluxeLib.Menu.SongMenu
     {
         private bool _CoverSmallLoaded;
         private bool _CoverBigLoaded;
-        private STexture _CoverTextureSmall = new STexture(-1);
-        private STexture _CoverTextureBig = new STexture(-1);
+        private CTexture _CoverTextureSmall = new CTexture(-1);
+        private CTexture _CoverTextureBig = new CTexture(-1);
 
         public SMedley Medley;
 
@@ -96,7 +97,7 @@ namespace VocaluxeLib.Menu.SongMenu
 
         public bool NotesLoaded { get; private set; }
 
-        public STexture CoverTextureSmall
+        public CTexture CoverTextureSmall
         {
             get
             {
@@ -112,7 +113,7 @@ namespace VocaluxeLib.Menu.SongMenu
             }
         }
 
-        public STexture CoverTextureBig
+        public CTexture CoverTextureBig
         {
             get { return _CoverBigLoaded ? _CoverTextureBig : _CoverTextureSmall; }
             set

VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

@@ -22,6 +22,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Xml;
+using VocaluxeLib.Draw;
 using VocaluxeLib.PartyModes;
 
 namespace VocaluxeLib.Menu.SongMenu
@@ -104,7 +105,7 @@ namespace VocaluxeLib.Menu.SongMenu
         private readonly List<int> _Streams = new List<int>();
         private int _Actsong = -1;
         private int _Actsongstream = -1;
-        protected STexture _Vidtex = new STexture(-1);
+        protected CTexture _Vidtex = new CTexture(-1);
 
         protected bool _Initialized;
         protected int _LastKnownNumSongs;
@@ -463,7 +464,7 @@ namespace VocaluxeLib.Menu.SongMenu
         public virtual void OnShow()
         {
             _Actsongstream = -1;
-            _Vidtex = new STexture(-1);
+            _Vidtex = new CTexture(-1);
         }
 
         public virtual void OnHide()

VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -22,6 +22,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
+using VocaluxeLib.Draw;
 using VocaluxeLib.PartyModes;
 
 namespace VocaluxeLib.Menu.SongMenu
@@ -37,8 +38,8 @@ namespace VocaluxeLib.Menu.SongMenu
         private CStatic _MedleyCalcIcon;
         private CStatic _MedleyTagIcon;
 
-        private STexture _CoverBigTexture;
-        private STexture _CoverTexture;
+        private CTexture _CoverBigTexture;
+        private CTexture _CoverTexture;
 
         private CText _Artist;
         private CText _Title;