banshee r3475 - in trunk/banshee: . src/Backends/Banshee.GStreamer/Banshee.GStreamer src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui

[sdroege svn gnome org]

Author: sdroege
Date: Tue Mar 18 18:01:41 2008
New Revision: 3475
URL: http://svn.gnome.org/viewvc/banshee?rev=3475&view=rev

Log:
* src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:
* src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:
Change the unit of the preamp setting into dB, otherwise the scale
next to it is confusing.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs

Modified: trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
==============================================================================
--- trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs	(original)
+++ trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs	Tue Mar 18 18:01:41 2008
@@ -317,7 +317,11 @@
         }
     
         public double AmplifierLevel {
-            set { gst_equalizer_set_preamp_level (handle, value); }
+            set {
+                double db = Math.Pow (10.0, value/20.0);
+
+                gst_equalizer_set_preamp_level (handle, db);
+            }
         }
         
         public int [] BandRange {

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs	Tue Mar 18 18:01:41 2008
@@ -60,12 +60,6 @@
         {
             Spacing = 10;
         
-            // amplifier_scale's values must be divisible by 100 to get *real* val. eg 100 == 1, 40 == 0.4, 1 == 0.01
-            amplifier_scale = new EqualizerBandScale (0, 100, 5, 150, "Preamp");
-            amplifier_scale.ValueChanged += OnAmplifierValueChanged;
-            amplifier_scale.Show ();
-            PackStart (amplifier_scale, false, false, 0);
-            
             int[] br = ((IEqualizer) ServiceManager.PlayerEngine.ActiveEngine).BandRange;
             int mid = (br[0] + br[1]) / 2;
             
@@ -73,6 +67,11 @@
             range[1] = mid;
             range[2] = br[1];
             
+            amplifier_scale = new EqualizerBandScale (0, range[1] * 10, range[0] * 10, range[2] * 10, "Preamp");
+            amplifier_scale.ValueChanged += OnAmplifierValueChanged;
+            amplifier_scale.Show ();
+            PackStart (amplifier_scale, false, false, 0);            
+            
             EqualizerLevelsBox eq_levels = new EqualizerLevelsBox (
                 FormatDecibelString (range[2]),
                 FormatDecibelString (range[1]),
@@ -146,7 +145,7 @@
         {
             EqualizerBandScale scale = o as EqualizerBandScale;
             if (active_eq != null) {
-                double val = (double) scale.Value / 100D;
+                double val = (double) scale.Value / 10D;
                 active_eq.AmplifierLevel = val;
             }