From 075eff5ae75e7415cb6ed01602c816d888ae842d Mon Sep 17 00:00:00 2001
From: Alexander Eckart <brunzel@gmx.li>
Date: Thu, 13 Dec 2012 21:13:32 +0100
Subject: [PATCH] backgrounds converted

---
 Vocaluxe/Base/CConfig.cs        | 75 +++++++++++++--------------------
 Vocaluxe/Menu/CBackground.cs    | 47 ++++++++++-----------
 Vocaluxe/Menu/CEqualizer.cs     |  4 +-
 Vocaluxe/Menu/CNameSelection.cs |  2 +-
 Vocaluxe/Menu/CSelectSlide.cs   |  2 +-
 Vocaluxe/Menu/CText.cs          |  6 +--
 Vocaluxe/Menu/IMenu.cs          | 12 ++++++
 7 files changed, 71 insertions(+), 77 deletions(-)

diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs
index 03d1e7d8..ed27480a 100644
--- a/Vocaluxe/Base/CConfig.cs
+++ b/Vocaluxe/Base/CConfig.cs
@@ -340,7 +340,7 @@ namespace Vocaluxe.Base
             #region Debug
             writer.WriteStartElement("Debug");
 
-            writer.WriteComment("DebugLevel: " + ListStrings(Enum.GetNames(typeof(EDebugLevel))));
+            writer.WriteComment("DebugLevel: " + CHelper.ListStrings(Enum.GetNames(typeof(EDebugLevel))));
             writer.WriteElementString("DebugLevel", Enum.GetName(typeof(EDebugLevel), DebugLevel));
 
             writer.WriteEndElement();
@@ -349,10 +349,10 @@ namespace Vocaluxe.Base
             #region Graphics
             writer.WriteStartElement("Graphics");
 
-            writer.WriteComment("Renderer: " + ListStrings(Enum.GetNames(typeof(ERenderer))));
+            writer.WriteComment("Renderer: " + CHelper.ListStrings(Enum.GetNames(typeof(ERenderer))));
             writer.WriteElementString("Renderer", Enum.GetName(typeof(ERenderer), Renderer));
 
-            writer.WriteComment("TextureQuality: " + ListStrings(Enum.GetNames(typeof(ETextureQuality))));
+            writer.WriteComment("TextureQuality: " + CHelper.ListStrings(Enum.GetNames(typeof(ETextureQuality))));
             writer.WriteElementString("TextureQuality", Enum.GetName(typeof(ETextureQuality), TextureQuality));
 
             writer.WriteComment("CoverSize (pixels): 32, 64, 128, 256, 512, 1024 (default: 128)");
@@ -362,19 +362,19 @@ namespace Vocaluxe.Base
             writer.WriteElementString("ScreenW", ScreenW.ToString());
             writer.WriteElementString("ScreenH", ScreenH.ToString());
 
-            writer.WriteComment("AAMode: " + ListStrings(Enum.GetNames(typeof(EAntiAliasingModes))));
+            writer.WriteComment("AAMode: " + CHelper.ListStrings(Enum.GetNames(typeof(EAntiAliasingModes))));
             writer.WriteElementString("AAMode", Enum.GetName(typeof(EAntiAliasingModes), AAMode));
 
-            writer.WriteComment("Colors: " + ListStrings(Enum.GetNames(typeof(EColorDeep))));
+            writer.WriteComment("Colors: " + CHelper.ListStrings(Enum.GetNames(typeof(EColorDeep))));
             writer.WriteElementString("Colors", Enum.GetName(typeof(EColorDeep), Colors));
 
             writer.WriteComment("MaxFPS should be between 1..200");
             writer.WriteElementString("MaxFPS", MaxFPS.ToString("#"));
 
-            writer.WriteComment("VSync: " + ListStrings(Enum.GetNames(typeof(EOffOn))));
+            writer.WriteComment("VSync: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))));
             writer.WriteElementString("VSync", Enum.GetName(typeof(EOffOn), VSync));
 
-            writer.WriteComment("FullScreen: " + ListStrings(Enum.GetNames(typeof(EOffOn))));
+            writer.WriteComment("FullScreen: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))));
             writer.WriteElementString("FullScreen", Enum.GetName(typeof(EOffOn), FullScreen));
 
             writer.WriteComment("FadeTime should be between 0..3 Seconds");
@@ -395,25 +395,25 @@ namespace Vocaluxe.Base
             writer.WriteComment("Name of cover-theme");
             writer.WriteElementString("Cover", CoverTheme);
 
-            writer.WriteComment("Draw note-lines:" + ListStrings(Enum.GetNames(typeof(EOffOn))));
+            writer.WriteComment("Draw note-lines:" + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))));
             writer.WriteElementString("DrawNoteLines", Enum.GetName(typeof(EOffOn), DrawNoteLines));
 
-            writer.WriteComment("Draw tone-helper:" + ListStrings(Enum.GetNames(typeof(EOffOn))));
+            writer.WriteComment("Draw tone-helper:" + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))));
             writer.WriteElementString("DrawToneHelper", Enum.GetName(typeof(EOffOn), DrawToneHelper));
 
-            writer.WriteComment("Look of timer:" + ListStrings(Enum.GetNames(typeof(ETimerLook))));
+            writer.WriteComment("Look of timer:" + CHelper.ListStrings(Enum.GetNames(typeof(ETimerLook))));
             writer.WriteElementString("TimerLook", Enum.GetName(typeof(ETimerLook), TimerLook));
 
-            writer.WriteComment("Information about players on SingScreen:" + ListStrings(Enum.GetNames(typeof(EPlayerInfo))));
+            writer.WriteComment("Information about players on SingScreen:" + CHelper.ListStrings(Enum.GetNames(typeof(EPlayerInfo))));
             writer.WriteElementString("PlayerInfo", Enum.GetName(typeof(EPlayerInfo), PlayerInfo));
 
-            writer.WriteComment("Fade player-information with lyrics and notebars:" + ListStrings(Enum.GetNames(typeof(EFadePlayerInfo))));
+            writer.WriteComment("Fade player-information with lyrics and notebars:" + CHelper.ListStrings(Enum.GetNames(typeof(EFadePlayerInfo))));
             writer.WriteElementString("FadePlayerInfo", Enum.GetName(typeof(EFadePlayerInfo), FadePlayerInfo));
 
-            writer.WriteComment("Cover Loading:" + ListStrings(Enum.GetNames(typeof(ECoverLoading))));
+            writer.WriteComment("Cover Loading:" + CHelper.ListStrings(Enum.GetNames(typeof(ECoverLoading))));
             writer.WriteElementString("CoverLoading", Enum.GetName(typeof(ECoverLoading), CoverLoading));
 
-            writer.WriteComment("Lyric Style:" + ListStrings(Enum.GetNames(typeof(ELyricStyle))));
+            writer.WriteComment("Lyric Style:" + CHelper.ListStrings(Enum.GetNames(typeof(ELyricStyle))));
             writer.WriteElementString("LyricStyle", Enum.GetName(typeof(ELyricStyle), LyricStyle));
 
             writer.WriteEndElement();
@@ -422,13 +422,13 @@ namespace Vocaluxe.Base
             #region Sound
             writer.WriteStartElement("Sound");
 
-            writer.WriteComment("PlayBackLib: " + ListStrings(Enum.GetNames(typeof(EPlaybackLib))));
+            writer.WriteComment("PlayBackLib: " + CHelper.ListStrings(Enum.GetNames(typeof(EPlaybackLib))));
             writer.WriteElementString("PlayBackLib", Enum.GetName(typeof(EPlaybackLib), PlayBackLib));
 
-            writer.WriteComment("RecordLib: " + ListStrings(Enum.GetNames(typeof(ERecordLib))));
+            writer.WriteComment("RecordLib: " + CHelper.ListStrings(Enum.GetNames(typeof(ERecordLib))));
             writer.WriteElementString("RecordLib", Enum.GetName(typeof(ERecordLib), RecordLib));
 
-            writer.WriteComment("AudioBufferSize: " + ListStrings(Enum.GetNames(typeof(EBufferSize))));
+            writer.WriteComment("AudioBufferSize: " + CHelper.ListStrings(Enum.GetNames(typeof(EBufferSize))));
             writer.WriteElementString("AudioBufferSize", Enum.GetName(typeof(EBufferSize), AudioBufferSize));
 
             writer.WriteComment("AudioLatency from -500 to 500 ms");
@@ -479,28 +479,28 @@ namespace Vocaluxe.Base
                 }
             }
 
-            writer.WriteComment("SongMenu: " + ListStrings(Enum.GetNames(typeof(ESongMenu))));
+            writer.WriteComment("SongMenu: " + CHelper.ListStrings(Enum.GetNames(typeof(ESongMenu))));
             writer.WriteElementString("SongMenu", Enum.GetName(typeof(ESongMenu), SongMenu));
 
-            writer.WriteComment("SongSorting: " + ListStrings(Enum.GetNames(typeof(ESongSorting))));
+            writer.WriteComment("SongSorting: " + CHelper.ListStrings(Enum.GetNames(typeof(ESongSorting))));
             writer.WriteElementString("SongSorting", Enum.GetName(typeof(ESongSorting), SongSorting));
 
-            writer.WriteComment("Ignore articles on song-sorting: " + ListStrings(Enum.GetNames(typeof(EOffOn))));
+            writer.WriteComment("Ignore articles on song-sorting: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))));
             writer.WriteElementString("IgnoreArticles", Enum.GetName(typeof(EOffOn), IgnoreArticles));
 
             writer.WriteComment("ScoreAnimationTime: Values >= 1 or 0 for no animation. Time is in seconds.");
             writer.WriteElementString("ScoreAnimationTime", ScoreAnimationTime.ToString());
 
-            writer.WriteComment("TimerMode: " + ListStrings(Enum.GetNames(typeof(ETimerMode))));
+            writer.WriteComment("TimerMode: " + CHelper.ListStrings(Enum.GetNames(typeof(ETimerMode))));
             writer.WriteElementString("TimerMode", Enum.GetName(typeof(ETimerMode), TimerMode));
 
             writer.WriteComment("NumPlayer: 1.." + CSettings.MaxNumPlayer.ToString());
             writer.WriteElementString("NumPlayer", NumPlayer.ToString());
 
-            writer.WriteComment("Order songs in tabs: " + ListStrings(Enum.GetNames(typeof(EOffOn))));
+            writer.WriteComment("Order songs in tabs: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))));
             writer.WriteElementString("Tabs", Enum.GetName(typeof(EOffOn), Tabs));
 
-            writer.WriteComment("Lyrics also on Top of screen: " + ListStrings(Enum.GetNames(typeof(EOffOn))));
+            writer.WriteComment("Lyrics also on Top of screen: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))));
             writer.WriteElementString("LyricsOnTop", Enum.GetName(typeof(EOffOn), LyricsOnTop));
 
             writer.WriteComment("Default profile for players 1..." + CSettings.MaxNumPlayer.ToString() + ":");
@@ -517,22 +517,22 @@ namespace Vocaluxe.Base
             #region Video
             writer.WriteStartElement("Video");
 
-            writer.WriteComment("VideoDecoder: " + ListStrings(Enum.GetNames(typeof(EVideoDecoder))));
+            writer.WriteComment("VideoDecoder: " + CHelper.ListStrings(Enum.GetNames(typeof(EVideoDecoder))));
             writer.WriteElementString("VideoDecoder", Enum.GetName(typeof(EVideoDecoder), VideoDecoder));
 
-            writer.WriteComment("VideoBackgrounds: " + ListStrings(Enum.GetNames(typeof(EOffOn))));
+            writer.WriteComment("VideoBackgrounds: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))));
             writer.WriteElementString("VideoBackgrounds", Enum.GetName(typeof(EOffOn), VideoBackgrounds));
 
-            writer.WriteComment("VideoPreview: " + ListStrings(Enum.GetNames(typeof(EOffOn))));
+            writer.WriteComment("VideoPreview: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))));
             writer.WriteElementString("VideoPreview", Enum.GetName(typeof(EOffOn), VideoPreview));
 
-            writer.WriteComment("Show Videos while singing: " + ListStrings(Enum.GetNames(typeof(EOffOn))));
+            writer.WriteComment("Show Videos while singing: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))));
             writer.WriteElementString("VideosInSongs", Enum.GetName(typeof(EOffOn), VideosInSongs));
 
-            writer.WriteComment("Show backgroundmusic videos as background: " + ListStrings(Enum.GetNames(typeof(EOffOn))));
+            writer.WriteComment("Show backgroundmusic videos as background: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))));
             writer.WriteElementString("VideosToBackground", Enum.GetName(typeof(EOffOn), VideosToBackground));
 
-            writer.WriteComment("WebcamLib: " + ListStrings(Enum.GetNames(typeof(EWebcamLib))));
+            writer.WriteComment("WebcamLib: " + CHelper.ListStrings(Enum.GetNames(typeof(EWebcamLib))));
             writer.WriteElementString("WebcamLib", Enum.GetName(typeof(EWebcamLib), WebcamLib));
 
             writer.WriteStartElement("WebcamConfig");
@@ -882,23 +882,6 @@ namespace Vocaluxe.Base
             return true;
         }
 
-        /// <summary>
-        /// Concat strings into one string with ", " as separator.
-        /// </summary>
-        public static string ListStrings(string[] str)
-        {
-            string _Result = string.Empty;
-
-            for (int i = 0; i < str.Length; i++)
-			{
-                _Result += str[i];
-			    if(i < str.Length - 1)
-                    _Result += ", ";
-			}
-    
-            return _Result;
-        }
-
         /// <summary>
         /// Use saved players from config now for games
         /// </summary>
diff --git a/Vocaluxe/Menu/CBackground.cs b/Vocaluxe/Menu/CBackground.cs
index 1c5a6738..6254ad34 100644
--- a/Vocaluxe/Menu/CBackground.cs
+++ b/Vocaluxe/Menu/CBackground.cs
@@ -6,9 +6,6 @@ using System.Text;
 using System.Xml;
 using System.Xml.XPath;
 
-using Vocaluxe.Base;
-using Vocaluxe.Lib.Draw;
-
 namespace Vocaluxe.Menu
 {
     public enum EBackgroundTypes
@@ -69,7 +66,7 @@ namespace Vocaluxe.Menu
                 
             if (CHelper.GetValueFromXML(item + "/Color", navigator, ref _Theme.ColorName, String.Empty))
             {
-                _ThemeLoaded &= CTheme.GetColor(_Theme.ColorName, SkinIndex, ref Color);
+                _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color);
             }
             else
             {
@@ -97,7 +94,7 @@ namespace Vocaluxe.Menu
             {
                 writer.WriteStartElement(_Theme.Name);
 
-                writer.WriteComment("<Type>: Background type: " + CConfig.ListStrings(Enum.GetNames(typeof(EBackgroundTypes))));
+                writer.WriteComment("<Type>: Background type: " + CHelper.ListStrings(Enum.GetNames(typeof(EBackgroundTypes))));
                 writer.WriteElementString("Type", Enum.GetName(typeof(EBackgroundTypes), _Theme.Type));
 
                 writer.WriteComment("<Video>: Background video name");
@@ -131,25 +128,27 @@ namespace Vocaluxe.Menu
 
         public void Resume()
         {
-            if (_Theme.Type == EBackgroundTypes.Video && _Theme.VideoName != String.Empty && CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON)
-                CTheme.SkinVideoResume(_Theme.VideoName);
+            if (_Theme.Type == EBackgroundTypes.Video && _Theme.VideoName != String.Empty && _Base.Config.GetVideoBackgrounds() == EOffOn.TR_CONFIG_ON)
+                _Base.Theme.SkinVideoResume(_Theme.VideoName);
         }
 
         public void Pause()
         {
             if (_Theme.VideoName != String.Empty)
-                CTheme.SkinVideoPause(_Theme.VideoName);
+                _Base.Theme.SkinVideoPause(_Theme.VideoName);
         }
 
         public bool Draw()
         {
             bool ok = false;
-            if (_Theme.Type == EBackgroundTypes.Video && CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON && CConfig.VideosToBackground == EOffOn.TR_CONFIG_ON && CBackgroundMusic.Playing && CBackgroundMusic.SongHasVideo && CBackgroundMusic.VideoEnabled && !CBackgroundMusic.Disabled)
+            if (_Theme.Type == EBackgroundTypes.Video && _Base.Config.GetVideoBackgrounds() == EOffOn.TR_CONFIG_ON &&
+                _Base.Config.GetVideosToBackground() == EOffOn.TR_CONFIG_ON && _Base.BackgroundMusic.IsPlaying() && _Base.BackgroundMusic.SongHasVideo() &&
+                _Base.BackgroundMusic.VideoEnabled() && !_Base.BackgroundMusic.IsDisabled())
             {
                 Pause();
                 ok = DrawBackgroundMusicVideo();
             }
-            else if (_Theme.Type == EBackgroundTypes.Video && CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON)
+            else if (_Theme.Type == EBackgroundTypes.Video && _Base.Config.GetVideoBackgrounds() == EOffOn.TR_CONFIG_ON)
             {
                 Resume();
                 ok = DrawVideo();
@@ -157,11 +156,11 @@ namespace Vocaluxe.Menu
 
             if (_Theme.TextureName != String.Empty &&
                 (_Theme.Type == EBackgroundTypes.Texture ||
-                (_Theme.Type == EBackgroundTypes.Video && (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_OFF || !ok))))
+                (_Theme.Type == EBackgroundTypes.Video && (_Base.Config.GetVideoBackgrounds() == EOffOn.TR_CONFIG_OFF || !ok))))
                 ok = DrawTexture();
             
             if (_Theme.Type == EBackgroundTypes.Color || _Theme.Type == EBackgroundTypes.Texture && !ok ||
-                (_Theme.Type == EBackgroundTypes.Video && CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_OFF && !ok))
+                (_Theme.Type == EBackgroundTypes.Video && _Base.Config.GetVideoBackgrounds() == EOffOn.TR_CONFIG_OFF && !ok))
                 DrawColor();
             
             return true;
@@ -174,7 +173,7 @@ namespace Vocaluxe.Menu
         public void LoadTextures()
         {
             if (_Theme.ColorName != String.Empty)
-                Color = CTheme.GetColor(_Theme.ColorName);
+                Color = _Base.Theme.GetColor(_Theme.ColorName);
         }
 
         public void ReloadTextures()
@@ -187,21 +186,21 @@ namespace Vocaluxe.Menu
         #region internal
         private void DrawColor()
         {
-            SRectF bounds = new SRectF(0f, 0f, CSettings.iRenderW, CSettings.iRenderH, CSettings.zFar/4);
+            SRectF bounds = new SRectF(0f, 0f, _Base.Settings.GetRenderW(), _Base.Settings.GetRenderH(), _Base.Settings.GetZFar()/4);
 
-            CDraw.DrawColor(Color, bounds);
+            _Base.Drawing.DrawColor(Color, bounds);
         }
 
         private bool DrawTexture()
         {
-            STexture Texture = CTheme.GetSkinTexture(_Theme.TextureName);
+            STexture Texture = _Base.Theme.GetSkinTexture(_Theme.TextureName);
             if (Texture.height > 0)
             {
-                RectangleF bounds = new RectangleF(0f, 0f, CSettings.iRenderW, CSettings.iRenderH);
+                RectangleF bounds = new RectangleF(0f, 0f, _Base.Settings.GetRenderW(), _Base.Settings.GetRenderH());
                 RectangleF rect = new RectangleF(0f, 0f, Texture.width, Texture.height);
                 CHelper.SetRect(bounds, ref rect, rect.Width / rect.Height, EAspect.Crop);
 
-                CDraw.DrawTexture(Texture, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, CSettings.zFar / 4));
+                _Base.Drawing.DrawTexture(Texture, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _Base.Settings.GetZFar() / 4));
                 return true;
             }
             return false;
@@ -209,14 +208,14 @@ namespace Vocaluxe.Menu
 
         private bool DrawVideo()
         {
-            STexture VideoTexture = CTheme.GetSkinVideoTexture(_Theme.VideoName);
+            STexture VideoTexture = _Base.Theme.GetSkinVideoTexture(_Theme.VideoName);
             if (VideoTexture.height > 0)
             {
-                RectangleF bounds = new RectangleF(0f, 0f, CSettings.iRenderW, CSettings.iRenderH);
+                RectangleF bounds = new RectangleF(0f, 0f, _Base.Settings.GetRenderW(), _Base.Settings.GetRenderH());
                 RectangleF rect = new RectangleF(0f, 0f, VideoTexture.width, VideoTexture.height);
                 CHelper.SetRect(bounds, ref rect, rect.Width / rect.Height, EAspect.Crop);
 
-                CDraw.DrawTexture(VideoTexture, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, CSettings.zFar / 4));
+                _Base.Drawing.DrawTexture(VideoTexture, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _Base.Settings.GetZFar() / 4));
                 return true;
             }
             return false;
@@ -224,14 +223,14 @@ namespace Vocaluxe.Menu
 
         private bool DrawBackgroundMusicVideo()
         {
-            STexture VideoTexture = CBackgroundMusic.GetVideoTexture();
+            STexture VideoTexture = _Base.BackgroundMusic.GetVideoTexture();
             if (VideoTexture.height > 0)
             {
-                RectangleF bounds = new RectangleF(0f, 0f, CSettings.iRenderW, CSettings.iRenderH);
+                RectangleF bounds = new RectangleF(0f, 0f, _Base.Settings.GetRenderW(), _Base.Settings.GetRenderH());
                 RectangleF rect = new RectangleF(0f, 0f, VideoTexture.width, VideoTexture.height);
                 CHelper.SetRect(bounds, ref rect, rect.Width / rect.Height, EAspect.Crop);
 
-                CDraw.DrawTexture(VideoTexture, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, CSettings.zFar / 4));
+                _Base.Drawing.DrawTexture(VideoTexture, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _Base.Settings.GetZFar() / 4));
                 return true;
             }
             return false;
diff --git a/Vocaluxe/Menu/CEqualizer.cs b/Vocaluxe/Menu/CEqualizer.cs
index 55f54377..afaa52ea 100644
--- a/Vocaluxe/Menu/CEqualizer.cs
+++ b/Vocaluxe/Menu/CEqualizer.cs
@@ -162,9 +162,9 @@ namespace Vocaluxe.Menu
                 writer.WriteElementString("NumBars", _Theme.NumBars.ToString("#0"));
                 writer.WriteComment("<Space>: Space between equalizer-elements.");
                 writer.WriteElementString("Space", Space.ToString("#0.00"));
-                writer.WriteComment("<Style>: Style of equalizer-elements: " + CConfig.ListStrings(Enum.GetNames(typeof(EEqualizerStyle))));
+                writer.WriteComment("<Style>: Style of equalizer-elements: " + CHelper.ListStrings(Enum.GetNames(typeof(EEqualizerStyle))));
                 writer.WriteElementString("Style", Enum.GetName(typeof(EEqualizerStyle), _Theme.Style));
-                writer.WriteComment("<DrawNegative>: Draw negative values: " + CConfig.ListStrings(Enum.GetNames(typeof(EOffOn))));
+                writer.WriteComment("<DrawNegative>: Draw negative values: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))));
                 writer.WriteElementString("DrawNegative", Enum.GetName(typeof(EOffOn), _Theme.DrawNegative));
 
                 writer.WriteComment("<Color>: Equalizer color from ColorScheme (high priority)");
diff --git a/Vocaluxe/Menu/CNameSelection.cs b/Vocaluxe/Menu/CNameSelection.cs
index 51ae095f..8ddaba64 100644
--- a/Vocaluxe/Menu/CNameSelection.cs
+++ b/Vocaluxe/Menu/CNameSelection.cs
@@ -232,7 +232,7 @@ namespace Vocaluxe.Menu
                     writer.WriteElementString("B", _Theme.NameColor.B.ToString("#0.00"));
                     writer.WriteElementString("A", _Theme.NameColor.A.ToString("#0.00"));
                 }
-                writer.WriteComment("<Style>: Text style: " + CConfig.ListStrings(Enum.GetNames(typeof(EStyle))));
+                writer.WriteComment("<Style>: Text style: " + CHelper.ListStrings(Enum.GetNames(typeof(EStyle))));
                 writer.WriteElementString("Style", _Theme.NameStyle.ToString());
                 writer.WriteComment("<H>: Text height");
                 writer.WriteElementString("H", _Theme.NameHeight.ToString("#0"));
diff --git a/Vocaluxe/Menu/CSelectSlide.cs b/Vocaluxe/Menu/CSelectSlide.cs
index b67aa31e..44d20c2b 100644
--- a/Vocaluxe/Menu/CSelectSlide.cs
+++ b/Vocaluxe/Menu/CSelectSlide.cs
@@ -527,7 +527,7 @@ namespace Vocaluxe.Menu
                 writer.WriteComment("<TextFont>: Text font name");
                 writer.WriteElementString("TextFont", _Theme.TextFont);
 
-                writer.WriteComment("<TextStyle>: Text style: " + CConfig.ListStrings(Enum.GetNames(typeof(EStyle))));
+                writer.WriteComment("<TextStyle>: Text style: " + CHelper.ListStrings(Enum.GetNames(typeof(EStyle))));
                 writer.WriteElementString("TextStyle", Enum.GetName(typeof(EStyle), _Theme.TextStyle));
 
                 writer.WriteComment("<NumVisible>: Number of visible elements in the slide");
diff --git a/Vocaluxe/Menu/CText.cs b/Vocaluxe/Menu/CText.cs
index ea203c38..4cda7051 100644
--- a/Vocaluxe/Menu/CText.cs
+++ b/Vocaluxe/Menu/CText.cs
@@ -571,13 +571,13 @@ namespace Vocaluxe.Menu
                     writer.WriteElementString("SA", SColor.A.ToString("#0.00"));
                 }
 
-                writer.WriteComment("<Align>: Text align horizontal: " + CConfig.ListStrings(Enum.GetNames(typeof(EAlignment))));
+                writer.WriteComment("<Align>: Text align horizontal: " + CHelper.ListStrings(Enum.GetNames(typeof(EAlignment))));
                 writer.WriteElementString("Align", Enum.GetName(typeof(EAlignment), Align));
 
-                writer.WriteComment("<HAlign>: Text align vertical (on downsizing): " + CConfig.ListStrings(Enum.GetNames(typeof(EHAlignment))));
+                writer.WriteComment("<HAlign>: Text align vertical (on downsizing): " + CHelper.ListStrings(Enum.GetNames(typeof(EHAlignment))));
                 writer.WriteElementString("HAlign", Enum.GetName(typeof(EHAlignment), HAlign));
 
-                writer.WriteComment("<Style>: Text style: " + CConfig.ListStrings(Enum.GetNames(typeof(EStyle))));
+                writer.WriteComment("<Style>: Text style: " + CHelper.ListStrings(Enum.GetNames(typeof(EStyle))));
                 writer.WriteElementString("Style", Enum.GetName(typeof(EStyle), Style));
 
                 writer.WriteComment("<Font>: Text font name");
diff --git a/Vocaluxe/Menu/IMenu.cs b/Vocaluxe/Menu/IMenu.cs
index 6538f979..07e0346c 100644
--- a/Vocaluxe/Menu/IMenu.cs
+++ b/Vocaluxe/Menu/IMenu.cs
@@ -48,6 +48,9 @@ namespace Vocaluxe.Menu
         void SetBackgroundMusicVolume(int NewVolume);
         int GetBackgroundMusicVolume();
 
+        EOffOn GetVideosToBackground();
+        EOffOn GetVideoBackgrounds();
+
         ESongMenu GetSongMenuType();
     }
 
@@ -68,6 +71,10 @@ namespace Vocaluxe.Menu
         string GetThemeScreensPath();
         int GetSkinIndex();
         STexture GetSkinTexture(string TextureName);
+        STexture GetSkinVideoTexture(string VideoName);
+
+        void SkinVideoResume(string VideoName);
+        void SkinVideoPause(string VideoName);
 
         SColorF GetColor(string ColorName);
         bool GetColor(string ColorName, int SkinIndex, ref SColorF Color);
@@ -86,6 +93,8 @@ namespace Vocaluxe.Menu
     {
         bool IsDisabled();
         bool IsPlaying();
+        bool SongHasVideo();
+        bool VideoEnabled();
         
         void Next();
         void Previous();
@@ -93,12 +102,15 @@ namespace Vocaluxe.Menu
         void Play();
 
         void ApplyVolume();
+
+        STexture GetVideoTexture();
     }
 
     public interface IDrawing
     {
         RectangleF GetTextBounds(CText text);
         
+        void DrawTexture(STexture Texture, SRectF Rect);
         void DrawTexture(STexture Texture, SRectF Rect, SColorF Color, SRectF Bounds);
         void DrawTextureReflection(STexture Texture, SRectF Rect, SColorF Color, SRectF Bounds, float ReflectionSpace, float ReflectionHeight);