From 9281cd1d359ef30dff0cbfde473965f8ec6ddeab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@gmail.com>
Date: Sun, 6 Dec 2015 11:25:04 +0100
Subject: [PATCH] Fix merge-errors

---
 VocaluxeLib/Menu/SongMenu/CSongMenuList.cs    | 37 ++++++++++++++++++-
 .../Menu/SongMenu/CSongMenuTileBoard.cs       | 18 ++++-----
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
index 8d1b3821..8bbd810a 100644
--- a/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
+++ b/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
@@ -22,6 +22,7 @@ using System.Windows.Forms;
 using VocaluxeLib.Draw;
 using VocaluxeLib.PartyModes;
 using VocaluxeLib.Songs;
+using VocaluxeLib.Xml;
 
 namespace VocaluxeLib.Menu.SongMenu
 {
@@ -51,7 +52,6 @@ namespace VocaluxeLib.Menu.SongMenu
         private int _TileH;
 
         private int _ListLength;
-        private float _CoverTileWidth;
         private float _ListTextWidth;
 
         // Offset is the song or categoryNr of the tile in the left upper corner
@@ -103,7 +103,7 @@ namespace VocaluxeLib.Menu.SongMenu
                 if (value == base._PreviewNr)
                 {
                     if (!CBase.BackgroundMusic.IsPlaying() && value != -1)
-                        CBase.BackgroundMusic.PlayPreview();
+                        CBase.BackgroundMusic.Play();
                     return;
                 }
                 base._PreviewNr = value;
@@ -128,6 +128,39 @@ namespace VocaluxeLib.Menu.SongMenu
             _SubElements.AddRange(new IMenuElement[] {_Artist, _Title, _SongLength, _DuetIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon});
         }
 
+        public override bool LoadTheme(string xmlPath, string elementName, CXmlReader xmlReader)
+        {
+            string item = xmlPath + "/" + elementName;
+
+            bool themeLoaded = true;
+            themeLoaded &= base.LoadTheme(xmlPath, elementName, xmlReader);
+
+
+            themeLoaded &= _Artist.LoadTheme(item + "/SongMenuList", "TextArtist", xmlReader);
+            themeLoaded &= _Title.LoadTheme(item + "/SongMenuList", "TextTitle", xmlReader);
+            themeLoaded &= _SongLength.LoadTheme(item + "/SongMenuList", "TextSongLength", xmlReader);
+
+            themeLoaded &= _CoverBig.LoadTheme(item + "/SongMenuList", "StaticCoverBig", xmlReader);
+            themeLoaded &= _TextBG.LoadTheme(item + "/SongMenuList", "StaticTextBG", xmlReader);
+            themeLoaded &= _DuetIcon.LoadTheme(item + "/SongMenuList", "StaticDuetIcon", xmlReader);
+            themeLoaded &= _VideoIcon.LoadTheme(item + "/SongMenuList", "StaticVideoIcon", xmlReader);
+            themeLoaded &= _MedleyCalcIcon.LoadTheme(item + "/SongMenuList", "StaticMedleyCalcIcon", xmlReader);
+            themeLoaded &= _MedleyTagIcon.LoadTheme(item + "/SongMenuList", "StaticMedleyTagIcon", xmlReader);
+
+            if (themeLoaded)
+            {
+                _Theme.Name = elementName;
+
+                _ReadSubTheme();
+                _SubElements.Clear();
+                _SubElements.AddRange(new IMenuElement[] { _Artist, _Title, _SongLength, _DuetIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon });
+                LoadSkin();
+                Init();
+            }
+
+            return themeLoaded;
+        }
+
         private void _ReadSubTheme()
         {
             _Theme.SongMenuList.TextArtist = (SThemeText)_Artist.GetTheme();
diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
index 66079637..ea8e0e3a 100644
--- a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+++ b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
@@ -30,19 +30,19 @@ namespace VocaluxeLib.Menu.SongMenu
     {
         private SRectF _ScrollRect;
         private List<CStatic> _Tiles;
-        private readonly CStatic _CoverBig;
-        private readonly CStatic _TextBG;
-        private readonly CStatic _DuetIcon;
-        private readonly CStatic _VideoIcon;
-        private readonly CStatic _MedleyCalcIcon;
-        private readonly CStatic _MedleyTagIcon;
+        private  CStatic _CoverBig;
+        private  CStatic _TextBG;
+        private  CStatic _DuetIcon;
+        private  CStatic _VideoIcon;
+        private  CStatic _MedleyCalcIcon;
+        private  CStatic _MedleyTagIcon;
 
         private CTextureRef _CoverBigBGTexture;
         private CTextureRef _CoverBGTexture;
 
-        private readonly CText _Artist;
-        private readonly CText _Title;
-        private readonly CText _SongLength;
+        private  CText _Artist;
+        private  CText _Title;
+        private  CText _SongLength;
 
         private int _NumW;
         private int _NumH;