From 6f9f90bea7f19a6390e5c817f3810cb8fa746a0f Mon Sep 17 00:00:00 2001
From: Florian Kuepper <florian.kuepper@googlemail.com>
Date: Sat, 11 Aug 2012 14:27:09 +0200
Subject: [PATCH] Some clean-up for equalizer.

---
 Output/Themes/Ambient/Screens/ScreenNames.xml | 12 ++++++------
 .../Ambient/Screens/ScreenOptionsRecord.xml   | 19 +++++++++++++++++++
 Vocaluxe/Menu/CEqualizer.cs                   |  1 -
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml
index cbc3beb1..c35f8b0f 100644
--- a/Output/Themes/Ambient/Screens/ScreenNames.xml
+++ b/Output/Themes/Ambient/Screens/ScreenNames.xml
@@ -1141,7 +1141,7 @@
 	  <NumBars>8</NumBars>
 	  <!--<Space>: Space between equalizer-elements.-->
 	  <Space>2,00</Space>
-	  <!--<Style>: Style of equalizer-elements-->
+	  <!--<Style>: Style of equalizer-elements: Collumns-->
 	  <Style>Collumns</Style>
 	  <!--<Color>: Equalizer color from ColorScheme (high priority)-->
 	  <!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1168,7 +1168,7 @@
 	  <NumBars>8</NumBars>
 	  <!--<Space>: Space between equalizer-elements.-->
 	  <Space>2,00</Space>
-	  <!--<Style>: Style of equalizer-elements-->
+	  <!--<Style>: Style of equalizer-elements: Collumns-->
 	  <Style>Collumns</Style>
 	  <!--<Color>: Equalizer color from ColorScheme (high priority)-->
 	  <!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1195,7 +1195,7 @@
 	  <NumBars>8</NumBars>
 	  <!--<Space>: Space between equalizer-elements.-->
 	  <Space>2,00</Space>
-	  <!--<Style>: Style of equalizer-elements-->
+	  <!--<Style>: Style of equalizer-elements: Collumns-->
 	  <Style>Collumns</Style>
 	  <!--<Color>: Equalizer color from ColorScheme (high priority)-->
 	  <!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1222,7 +1222,7 @@
 	  <NumBars>8</NumBars>
 	  <!--<Space>: Space between equalizer-elements.-->
 	  <Space>2,00</Space>
-	  <!--<Style>: Style of equalizer-elements-->
+	  <!--<Style>: Style of equalizer-elements: Collumns-->
 	  <Style>Collumns</Style>
 	  <!--<Color>: Equalizer color from ColorScheme (high priority)-->
 	  <!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1249,7 +1249,7 @@
 	  <NumBars>8</NumBars>
 	  <!--<Space>: Space between equalizer-elements.-->
 	  <Space>2,00</Space>
-	  <!--<Style>: Style of equalizer-elements-->
+	  <!--<Style>: Style of equalizer-elements: Collumns-->
 	  <Style>Collumns</Style>
 	  <!--<Color>: Equalizer color from ColorScheme (high priority)-->
 	  <!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -1274,7 +1274,7 @@
       <H>60</H>	  
 	  <!--<NumBars>: Number of equalizer-elements.-->
 	  <NumBars>8</NumBars>
-	  <!--<Space>: Space between equalizer-elements.-->
+	  <!--<Style>: Style of equalizer-elements: Collumns-->
 	  <Space>2,00</Space>
 	  <!--<Style>: Style of equalizer-elements-->
 	  <Style>Collumns</Style>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
index a473d310..7375fd34 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
@@ -859,17 +859,26 @@
       <NumVisible>5</NumVisible>
     </SelectSlideDelay>
 	<EqualizerChannel1>
+	  <!--<Skin>: Texture name-->
 	  <Skin>Invisible</Skin>
+	  <!--<X>, <Y>, <Z>, <W>, <H>: Equalizer position, width and height-->
 	  <X>50</X>
 	  <Y>400</Y>
 	  <W>230</W>
 	  <H>150</H>
 	  <Z>-1,00</Z>
+	  <!--<NumBars>: Number of equalizer-elements.-->
 	  <NumBars>10</NumBars>
 	  <Space>2,00</Space>
+	  <!--<Style>: Style of equalizer-elements: Collumns-->
 	  <Style>Collumns</Style>
+	  <!--<Color>: Equalizer color from ColorScheme (high priority)-->
+	  <!--or <R>, <G>, <B>, <A> (lower priority)-->
 	  <Color>ButtonColor</Color>
+	  <!--<MaxColor>: Equalizer color for maximal volume from ColorScheme (high priority)-->
+	  <!--or <MaxR>, <MaxG>, <MaxB>, <MaxA> (lower priority)-->
 	  <MaxColor>ButtonSColor</MaxColor>
+	  <!--<DrawNegative>: Draw negative values: TR_CONFIG_OFF, TR_CONFIG_ON -->
 	  <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <!--<Reflection> If exists:-->
       <!--   <Space>: Reflection Space-->
@@ -880,17 +889,27 @@
       </Reflection>	  
 	</EqualizerChannel1>
 	<EqualizerChannel2>
+	  <!--<Skin>: Texture name-->
 	  <Skin>Invisible</Skin>
+	  <!--<X>, <Y>, <Z>, <W>, <H>: Equalizer position, width and height-->
 	  <X>400</X>
 	  <Y>400</Y>
 	  <W>230</W>
 	  <H>150</H>
 	  <Z>-1,00</Z>
+	  <!--<NumBars>: Number of equalizer-elements.-->
 	  <NumBars>10</NumBars>
+	  <!--<Space>: Space between equalizer-elements.-->
 	  <Space>2,00</Space>
+	  <!--<Style>: Style of equalizer-elements: Collumns-->
 	  <Style>Collumns</Style>
+	  <!--<Color>: Equalizer color from ColorScheme (high priority)-->
+	  <!--or <R>, <G>, <B>, <A> (lower priority)-->
 	  <Color>ButtonColor</Color>
+	  <!--<MaxColor>: Equalizer color for maximal volume from ColorScheme (high priority)-->
+	  <!--or <MaxR>, <MaxG>, <MaxB>, <MaxA> (lower priority)-->
 	  <MaxColor>ButtonSColor</MaxColor>
+	  <!--<DrawNegative>: Draw negative values: TR_CONFIG_OFF, TR_CONFIG_ON -->
 	  <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <!--<Reflection> If exists:-->
       <!--   <Space>: Reflection Space-->
diff --git a/Vocaluxe/Menu/CEqualizer.cs b/Vocaluxe/Menu/CEqualizer.cs
index 2f82759c..a3c6767d 100644
--- a/Vocaluxe/Menu/CEqualizer.cs
+++ b/Vocaluxe/Menu/CEqualizer.cs
@@ -12,7 +12,6 @@ namespace Vocaluxe.Menu
 {
     enum EEqualizerStyle 
     {
-        Bars,
         Collums
     }