Merge remote-tracking branch 'remotes/origin/develop' into develop

Conflicts:
	Vocaluxe.sln
	Vocaluxe/Base/CConfig.cs

VocaluxeLib/Menu/IMenu.cs

@@ -628,7 +628,8 @@ namespace Vocaluxe.Menu
     public enum EPlaybackLib
     {
         PortAudio,
-        OpenAL
+        OpenAL,
+        Gstreamer
     }
 
     public enum EWebcamLib
@@ -647,7 +648,8 @@ namespace Vocaluxe.Menu
 
     public enum EVideoDecoder
     {
-        FFmpeg
+        FFmpeg,
+        Gstreamer
     }
 
     public enum ESongMenu

VocaluxeLib/Menu/SingNotes/CSingNotes.cs

@@ -530,7 +530,12 @@ namespace Vocaluxe.Menu.SingNotes
 
 
             CBase.Drawing.DrawTexture(NoteBegin, new SRectF(r.X, r.Y, dx, r.H, r.Z), Color);
-            CBase.Drawing.DrawTexture(NoteMiddle, new SRectF(r.X + dx, r.Y, r.W - 2 * dx, r.H, r.Z), Color);
+
+            if (r.W - 2 * dx >= 2 * dx)
+                CBase.Drawing.DrawTexture(NoteMiddle, new SRectF(r.X + dx, r.Y, r.W - 2 * dx, r.H, r.Z), Color);
+            else
+                CBase.Drawing.DrawTexture(NoteMiddle, new SRectF(r.X + dx, r.Y, 2 * dx, r.H, r.Z), Color, new SRectF(r.X + dx, r.Y, r.W - 2 * dx, r.H, r.Z));
+
             CBase.Drawing.DrawTexture(NoteEnd, new SRectF(r.X + r.W - dx, r.Y, dx, r.H, r.Z), Color);
         }
 
@@ -573,7 +578,12 @@ namespace Vocaluxe.Menu.SingNotes
             SColorF col = new SColorF(Color.R, Color.G, Color.B, Color.A * alpha);
 
             CBase.Drawing.DrawTexture(NoteBackgroundBegin, new SRectF(r.X, r.Y, dx, r.H, r.Z), col);
-            CBase.Drawing.DrawTexture(NoteBackgroundMiddle, new SRectF(r.X + dx, r.Y, r.W - 2 * dx, r.H, r.Z), col);
+
+            if (r.W - 2 * dx >= 2 * dx)
+                CBase.Drawing.DrawTexture(NoteBackgroundMiddle, new SRectF(r.X + dx, r.Y, r.W - 2 * dx, r.H, r.Z), col);
+            else
+                CBase.Drawing.DrawTexture(NoteBackgroundMiddle, new SRectF(r.X + dx, r.Y, 2 * dx, r.H, r.Z), col, new SRectF(r.X + dx, r.Y, r.W - 2 * dx, r.H, r.Z));
+
             CBase.Drawing.DrawTexture(NoteBackgroundEnd, new SRectF(r.X + r.W - dx, r.Y, dx, r.H, r.Z), col);
         }
 

VocaluxeLib/Menu/SongMenu/CSong.cs

@@ -31,14 +31,44 @@ namespace Vocaluxe.Menu.SongMenu
     public class CCategory
     {
         public string Name = String.Empty;
-        public STexture CoverTextureSmall = new STexture(-1);
-        public STexture CoverTextureBig = new STexture(-1);
+        private STexture _CoverTextureSmall = new STexture(-1);
+        private STexture _CoverTextureBig = new STexture(-1);
+        private bool _CoverBigLoaded = false;
 
         public CCategory(string name)
         {
             Name = name;
         }
 
+        public STexture CoverTextureSmall
+        {
+            get { return _CoverTextureSmall; }
+
+            set
+            {
+                _CoverTextureSmall = value;
+            }
+        }
+
+        public STexture CoverTextureBig
+        {
+            get
+            {
+                if (_CoverBigLoaded)
+                    return _CoverTextureBig;
+                else
+                    return _CoverTextureSmall;
+            }
+            set
+            {
+                if (value.index != -1)
+                {
+                    _CoverTextureBig = value;
+                    _CoverBigLoaded = true;
+                }
+            }
+        }
+
         public CCategory(string name, STexture CoverSmall, STexture CoverBig)
         {
             Name = name;