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

[sdroege svn gnome org]

Author: sdroege
Date: Mon Jun  2 08:43:30 2008
New Revision: 4061
URL: http://svn.gnome.org/viewvc/banshee?rev=4061&view=rev

Log:
* src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:
Rename local variable from db to scale as it holds a scale factor
which was calculated from a db value and not the other way around.
* src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:
* src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs:
0dB is passthrough and should be used as default value. 1dB will make
the sound a bit louder and can already lead to clipping in rare
situations.
* src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:
Make the preamp levels more consistent with the eq levels and don't
always do (level / 10) * 10.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.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	Mon Jun  2 08:43:30 2008
@@ -378,8 +378,8 @@
         
         public double AmplifierLevel {
             set {
-                double db = Math.Pow (10.0, value / 20.0);
-                bp_equalizer_set_preamp_level (handle, db);
+                double scale = Math.Pow (10.0, value / 20.0);
+                bp_equalizer_set_preamp_level (handle, scale);
             }
         }
         

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs	Mon Jun  2 08:43:30 2008
@@ -142,7 +142,7 @@
                     ((IEqualizer) ServiceManager.PlayerEngine.ActiveEngine).SetEqualizerGain (i, 0);
                 }
                 
-                ((IEqualizer) ServiceManager.PlayerEngine.ActiveEngine).AmplifierLevel = 1D;
+                ((IEqualizer) ServiceManager.PlayerEngine.ActiveEngine).AmplifierLevel = 0;
             }
         }
         

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs	Mon Jun  2 08:43:30 2008
@@ -39,7 +39,7 @@
     {
         private string name;
         private Dictionary<uint, double> bands = new Dictionary<uint, double> ();
-        private double amp = 1;    // dB multiplier (0db is mute, 1db is no change - passthrough)
+        private double amp = 0;    // amplifier dB (0 dB == passthrough)
         private bool enabled = true;
         private const uint bandcount = 10;
         

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	Mon Jun  2 08:43:30 2008
@@ -130,7 +130,7 @@
             EqualizerBandScale scale = o as EqualizerBandScale;
             
             if (active_eq != null) {
-                active_eq.SetGain (scale.Band, (double)scale.Value / 10D);
+                active_eq.SetGain (scale.Band, (double)scale.Value / 10);
             }
             
             if (EqualizerChanged != null) {
@@ -142,8 +142,7 @@
         {
             EqualizerBandScale scale = o as EqualizerBandScale;
             if (active_eq != null) {
-                double val = (double) scale.Value / 10D;
-                active_eq.AmplifierLevel = val;
+                active_eq.AmplifierLevel = (double) (scale.Value / 10.0);
             }
             
             if (AmplifierChanged != null) {
@@ -182,8 +181,8 @@
         }
 
         public double AmplifierLevel {
-            get { return (double) amplifier_scale.Value / 100D; }
-            set { amplifier_scale.Value = (int) (value * 100); }
+            get { return (double) amplifier_scale.Value / 10; }
+            set { amplifier_scale.Value = (int) (value * 10); }
         }
         
         public EqualizerSetting EqualizerSetting {
@@ -196,7 +195,7 @@
                     return;
                 }
                 
-                AmplifierLevel = active_eq.AmplifierLevel / 10;
+                AmplifierLevel = active_eq.AmplifierLevel;
                 
                 for (int i = 0; i < active_eq.BandCount; i++) {
                     uint x = (uint) i;