* all: added a new variable "equalizer.preamp" (self-explanatory ;) in skins

* winamp2.xml: added preamp slider and fixed offsets

diff --git a/modules/gui/skins2/commands/cmd_vars.cpp b/modules/gui/skins2/commands/cmd_vars.cpp
index 9c846f0d70cbb45face805119efb2df2e7f6c730..b64ede8be17b5648114278306b81a97a5ebf1eb4 100644 (file)
--- a/modules/gui/skins2/commands/cmd_vars.cpp
+++ b/modules/gui/skins2/commands/cmd_vars.cpp
@@ -65,3 +65,9 @@ void CmdSetEqBands::execute()
     m_rEqBands.set( m_value );
 }
 
+
+void CmdSetEqPreamp::execute()
+{
+    // Change the preamp variable
+    m_rPreamp.set( m_value, false );
+}

diff --git a/modules/gui/skins2/commands/cmd_vars.hpp b/modules/gui/skins2/commands/cmd_vars.hpp
index de31378a4cfc53b9aa8ca45944b8e9b4faed2928..a2445ed0deaa969128a34f7ffef0b90ebe7c67d0 100644 (file)
--- a/modules/gui/skins2/commands/cmd_vars.hpp
+++ b/modules/gui/skins2/commands/cmd_vars.hpp
@@ -28,6 +28,7 @@
 #include "../utils/ustring.hpp"
 
 class EqualizerBands;
+class EqualizerPreamp;
 class VarText;
 
 /// Command to notify the playlist of a change
@@ -79,6 +80,29 @@ class CmdSetText: public CmdGeneric
 };
 
 
+/// Command to set the equalizer preamp
+class CmdSetEqPreamp: public CmdGeneric
+{
+    public:
+        CmdSetEqPreamp( intf_thread_t *pIntf, EqualizerPreamp &rPreamp,
+                       float value ):
+            CmdGeneric( pIntf ), m_rPreamp( rPreamp ), m_value( value ) {}
+        virtual ~CmdSetEqPreamp() {}
+
+        /// This method does the real job of the command
+        virtual void execute();
+
+        /// Return the type of the command
+        virtual string getType() const { return "set equalizer preamp"; }
+
+    private:
+        /// Preamp variable to set
+        EqualizerPreamp &m_rPreamp;
+        /// Value to set
+        float m_value;
+};
+
+
 /// Command to set the equalizerbands
 class CmdSetEqBands: public CmdGeneric
 {

diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp
index 5b25e977f7f7693b86c848d5cef1e27c67e62bdc..d86436e01a5a0654d7511f8318cc97bb69e69fad 100644 (file)
--- a/modules/gui/skins2/src/vlcproc.cpp
+++ b/modules/gui/skins2/src/vlcproc.cpp
@@ -5,7 +5,7 @@
  * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teuli�e <ipkiss@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -98,6 +98,7 @@ VlcProc::VlcProc( intf_thread_t *pIntf ): SkinObject( pIntf ),
     REGISTER_VAR( m_cVarPaused, VarBoolImpl, "vlc.isPaused" )
     REGISTER_VAR( m_cVarSeekable, VarBoolImpl, "vlc.isSeekable" )
     REGISTER_VAR( m_cVarEqualizer, VarBoolImpl, "equalizer.isEnabled" )
+    REGISTER_VAR( m_cVarEqPreamp, EqualizerPreamp, "equalizer.preamp" )
 #undef REGISTER_VAR
     m_cVarStreamName = VariablePtr( new VarText( getIntf(), false ) );
     pVarManager->registerVar( m_cVarStreamName, "streamName" );
@@ -304,9 +305,11 @@ void VlcProc::refreshAudio()
     {
         if( pAout != m_pAout )
         {
-            // Register the equalizer callback
+            // Register the equalizer callbacks
             if( !var_AddCallback( pAout, "equalizer-bands",
-                                 onEqBandsChange, this ) )
+                                  onEqBandsChange, this ) &&
+                !var_AddCallback( pAout, "equalizer-preamp",
+                                  onEqPreampChange, this ) )
             {
                 m_pAout = pAout;
                 //char * psz_bands = var_GetString( p_aout, "equalizer-bands" );
@@ -567,3 +570,20 @@ int VlcProc::onEqBandsChange( vlc_object_t *pObj, const char *pVariable,
     return VLC_SUCCESS;
 }
 
+
+int VlcProc::onEqPreampChange( vlc_object_t *pObj, const char *pVariable,
+                               vlc_value_t oldVal, vlc_value_t newVal,
+                               void *pParam )
+{
+    VlcProc *pThis = (VlcProc*)pParam;
+    EqualizerPreamp *pVarPreamp = (EqualizerPreamp*)(pThis->m_cVarEqPreamp.get());
+
+    // Post a set preamp command
+    CmdSetEqPreamp *pCmd = new CmdSetEqPreamp( pThis->getIntf(), *pVarPreamp,
+                                              (newVal.f_float + 20.0) / 40.0 );
+    AsyncQueue *pQueue = AsyncQueue::instance( pThis->getIntf() );
+    pQueue->push( CmdGenericPtr( pCmd ) );
+
+    return VLC_SUCCESS;
+}
+

diff --git a/modules/gui/skins2/src/vlcproc.hpp b/modules/gui/skins2/src/vlcproc.hpp
index 8d0113fd807bd955d6e759cddde7002d3e3e54c8..16e65804e5868e13b7ae9a3c358fa7dca18620ff 100644 (file)
--- a/modules/gui/skins2/src/vlcproc.hpp
+++ b/modules/gui/skins2/src/vlcproc.hpp
@@ -5,7 +5,7 @@
  * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teuli�e <ipkiss@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -119,8 +119,9 @@ class VlcProc: public SkinObject
         VariablePtr m_cVarSeekable;
         /// Variable for the vout
         VarBox m_varVoutSize;
-        /// Equalizer variable
+        /// Equalizer variables
         EqualizerBands m_varEqBands;
+        VariablePtr m_cVarEqPreamp;
         VariablePtr m_cVarEqualizer;
 
         /// Set of handles of vout windows
@@ -194,6 +195,11 @@ class VlcProc: public SkinObject
         static int onEqBandsChange( vlc_object_t *pObj, const char *pVariable,
                                     vlc_value_t oldVal, vlc_value_t newVal,
                                     void *pParam );
+
+        /// Callback for equalizer-preamp variable
+        static int onEqPreampChange( vlc_object_t *pObj, const char *pVariable,
+                                     vlc_value_t oldVal, vlc_value_t newVal,
+                                     void *pParam );
 };
 
 

diff --git a/modules/gui/skins2/vars/equalizer.cpp b/modules/gui/skins2/vars/equalizer.cpp
index 27b23b1c6c5e2a4af398c8f6fefa8c1d0ba1395b..87fca34fcb999419fc23c48ad6deb4abe437c61a 100644 (file)
--- a/modules/gui/skins2/vars/equalizer.cpp
+++ b/modules/gui/skins2/vars/equalizer.cpp
@@ -96,7 +96,7 @@ void EqualizerBands::onUpdate( Subject<VarPercent> &rBand )
             ss << " " << val;
         }
 
-        aout_instance_t *pAout= (aout_instance_t *)vlc_object_find( getIntf(),
+        aout_instance_t *pAout = (aout_instance_t *)vlc_object_find( getIntf(),
                 VLC_OBJECT_AOUT, FIND_ANYWHERE );
         char *bands = (char*)ss.str().c_str();
         config_PutPsz( getIntf(), "equalizer-bands", bands );
@@ -109,3 +109,31 @@ void EqualizerBands::onUpdate( Subject<VarPercent> &rBand )
     }
 }
 
+
+EqualizerPreamp::EqualizerPreamp( intf_thread_t *pIntf ): VarPercent( pIntf )
+{
+    // Initial value
+    VarPercent::set( 0.8 );
+}
+
+
+void EqualizerPreamp::set( float percentage, bool updateVLC )
+{
+    VarPercent::set( percentage );
+
+    // Avoid infinite loop
+    if( updateVLC )
+    {
+        float val = 40 * percentage - 20;
+
+        aout_instance_t *pAout = (aout_instance_t *)vlc_object_find( getIntf(),
+                                VLC_OBJECT_AOUT, FIND_ANYWHERE );
+        config_PutFloat( getIntf(), "equalizer-preamp", val );
+        if( pAout )
+        {
+            // Update the audio output
+            var_SetFloat( pAout, "equalizer-preamp", val );
+            vlc_object_release( pAout );
+        }
+    }
+}

diff --git a/modules/gui/skins2/vars/equalizer.hpp b/modules/gui/skins2/vars/equalizer.hpp
index 08f45bca672cf9ff5b27bc0b256fbcbb76ded5da..48bc031b78e5c87f88c5f2671206b03be9412ae4 100644 (file)
--- a/modules/gui/skins2/vars/equalizer.hpp
+++ b/modules/gui/skins2/vars/equalizer.hpp
@@ -56,4 +56,17 @@ class EqualizerBands: public SkinObject, public Observer<VarPercent>
 };
 
 
+/// Variable for equalizer preamp
+class EqualizerPreamp: public VarPercent
+{
+    public:
+        EqualizerPreamp( intf_thread_t *pIntf );
+        virtual ~EqualizerPreamp() {}
+
+        virtual void set( float percentage, bool updateVLC );
+
+        void set( float percentage ) { set( percentage, true ); }
+};
+
+
 #endif

diff --git a/modules/gui/skins2/vars/time.hpp b/modules/gui/skins2/vars/time.hpp
index 0292c43cc85ff0dae3987cd98437876dc33ceb33..5768587a117dbf0a9f7626e88fbdf39131885582 100644 (file)
--- a/modules/gui/skins2/vars/time.hpp
+++ b/modules/gui/skins2/vars/time.hpp
@@ -5,7 +5,7 @@
  * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teuli�e <ipkiss@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 #include "../utils/var_percent.hpp"
 #include <string>
 
-/// Variable for VLC strem time
+/// Variable for VLC stream time
 class StreamTime: public VarPercent
 {
     public:

diff --git a/share/skins2/winamp2.xml b/share/skins2/winamp2.xml
index 58380a215190932d9343d01d08d651aa382899a5..fdd88a06929ae144c8a5def5f657114be17216cc 100644 (file)
--- a/share/skins2/winamp2.xml
+++ b/share/skins2/winamp2.xml
@@ -248,34 +248,37 @@
                 <Button x="254" y="3" up="eq_switch_up" down="eq_switch_down" over="eq_switch_up" action="equalizer_window.setLayout(eq_small_layout)" tooltiptext="Switch" />
                 <Button x="264" y="3" up="eq_close_up" down="eq_close_down" over="eq_close_up" action="equalizer_window.hide()" tooltiptext="Close the window" />
                 <Checkbox x="15" y="18" up1="eq_notok_up" down1="eq_notok_down" up2="eq_ok_up" down2="eq_ok_down" state="equalizer.isEnabled" action1="equalizer.enable()" action2="equalizer.disable()" tooltiptext1="Enable equalizer" tooltiptext2="Disable equalizer" />
-                <Slider value="equalizer.band(0)" x="78" y="37" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
+               <Slider value="equalizer.preamp" x="21" y="39" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
                     <SliderBackground image="eq_slider_bg" nbhoriz="14" nbvert="2" padhoriz="1" padvert="1" />
                 </Slider>
-                <Slider value="equalizer.band(1)" x="96" y="37" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
+                <Slider value="equalizer.band(0)" x="78" y="39" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
                     <SliderBackground image="eq_slider_bg" nbhoriz="14" nbvert="2" padhoriz="1" padvert="1" />
                 </Slider>
-                <Slider value="equalizer.band(2)" x="114" y="37" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
+                <Slider value="equalizer.band(1)" x="96" y="39" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
                     <SliderBackground image="eq_slider_bg" nbhoriz="14" nbvert="2" padhoriz="1" padvert="1" />
                 </Slider>
-                <Slider value="equalizer.band(3)" x="132" y="37" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
+                <Slider value="equalizer.band(2)" x="114" y="39" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
                     <SliderBackground image="eq_slider_bg" nbhoriz="14" nbvert="2" padhoriz="1" padvert="1" />
                 </Slider>
-                <Slider value="equalizer.band(4)" x="150" y="37" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
+                <Slider value="equalizer.band(3)" x="132" y="39" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
                     <SliderBackground image="eq_slider_bg" nbhoriz="14" nbvert="2" padhoriz="1" padvert="1" />
                 </Slider>
-                <Slider value="equalizer.band(5)" x="168" y="37" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
+                <Slider value="equalizer.band(4)" x="150" y="39" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
                     <SliderBackground image="eq_slider_bg" nbhoriz="14" nbvert="2" padhoriz="1" padvert="1" />
                 </Slider>
-                <Slider value="equalizer.band(6)" x="186" y="37" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
+                <Slider value="equalizer.band(5)" x="168" y="39" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
                     <SliderBackground image="eq_slider_bg" nbhoriz="14" nbvert="2" padhoriz="1" padvert="1" />
                 </Slider>
-                <Slider value="equalizer.band(7)" x="204" y="37" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
+                <Slider value="equalizer.band(6)" x="186" y="39" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
                     <SliderBackground image="eq_slider_bg" nbhoriz="14" nbvert="2" padhoriz="1" padvert="1" />
                 </Slider>
-                <Slider value="equalizer.band(8)" x="222" y="37" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
+                <Slider value="equalizer.band(7)" x="204" y="39" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
                     <SliderBackground image="eq_slider_bg" nbhoriz="14" nbvert="2" padhoriz="1" padvert="1" />
                 </Slider>
-                <Slider value="equalizer.band(9)" x="240" y="37" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
+                <Slider value="equalizer.band(8)" x="222" y="39" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
+                    <SliderBackground image="eq_slider_bg" nbhoriz="14" nbvert="2" padhoriz="1" padvert="1" />
+                </Slider>
+                <Slider value="equalizer.band(9)" x="240" y="39" up="eq_slider_up" down="eq_slider_down" points="(6,55),(6,7)" thickness="6" tooltiptext="">
                     <SliderBackground image="eq_slider_bg" nbhoriz="14" nbvert="2" padhoriz="1" padvert="1" />
                 </Slider>
             </Group>