From 2e3fe88d400191c65b07688ed17421ed4fc4c73b Mon Sep 17 00:00:00 2001
From: Alexander Eckart <brunzel@gmx.li>
Date: Thu, 13 Dec 2012 22:00:57 +0100
Subject: [PATCH] equalizer converted

---
 Vocaluxe/Menu/CEqualizer.cs | 15 ++++++---------
 Vocaluxe/Menu/IMenu.cs      |  1 +
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Vocaluxe/Menu/CEqualizer.cs b/Vocaluxe/Menu/CEqualizer.cs
index afaa52ea..ff0dafe2 100644
--- a/Vocaluxe/Menu/CEqualizer.cs
+++ b/Vocaluxe/Menu/CEqualizer.cs
@@ -5,9 +5,6 @@ using System.Text;
 using System.Xml;
 using System.Xml.XPath;
 
-using Vocaluxe.Base;
-using Vocaluxe.Lib.Draw;
-
 namespace Vocaluxe.Menu
 {
     enum EEqualizerStyle 
@@ -97,7 +94,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
             {
@@ -109,7 +106,7 @@ namespace Vocaluxe.Menu
 
             if (CHelper.GetValueFromXML(item + "/MaxColor", navigator, ref _Theme.MaxColorName, String.Empty))
             {
-                _ThemeLoaded &= CTheme.GetColor(_Theme.ColorName, SkinIndex, ref Color);
+                _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color);
             }
             else
             {
@@ -264,10 +261,10 @@ namespace Vocaluxe.Menu
                     color = MaxColor;
                 }
 
-                CDraw.DrawColor(color, bar);
+                _Base.Drawing.DrawColor(color, bar);
 
                 if (Reflection)
-                    CDraw.DrawColorReflection(color, bar, ReflectionSpace, ReflectionHeight);
+                    _Base.Drawing.DrawColorReflection(color, bar, ReflectionSpace, ReflectionHeight);
             }
         }
 
@@ -278,10 +275,10 @@ namespace Vocaluxe.Menu
         public void LoadTextures()
         {
             if (_Theme.ColorName != String.Empty)
-                Color = CTheme.GetColor(_Theme.ColorName);
+                Color = _Base.Theme.GetColor(_Theme.ColorName);
 
             if (_Theme.MaxColorName != String.Empty)
-                MaxColor = CTheme.GetColor(_Theme.MaxColorName);
+                MaxColor = _Base.Theme.GetColor(_Theme.MaxColorName);
         }
 
         public void ReloadTextures()
diff --git a/Vocaluxe/Menu/IMenu.cs b/Vocaluxe/Menu/IMenu.cs
index 96bcdf4a..21e0ca0a 100644
--- a/Vocaluxe/Menu/IMenu.cs
+++ b/Vocaluxe/Menu/IMenu.cs
@@ -116,6 +116,7 @@ namespace Vocaluxe.Menu
         void DrawTextureReflection(STexture Texture, SRectF Rect, SColorF Color, SRectF Bounds, float ReflectionSpace, float ReflectionHeight);
 
         void DrawColor(SColorF Color, SRectF Rect);
+        void DrawColorReflection(SColorF Color, SRectF Rect, float Space, float Height);
     }
 
     public interface IGraphics