Qt4 - SimplePrefs - Audio: Small fixes and normalization for volume.

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 80e9c33cb2f8056bf76780b045c941b9d60f9255..04725473e4e23750aa46f9a759abd0d0b08a8b4f 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -551,8 +551,7 @@ void IntegerRangeConfigControl::finish()
 IntegerRangeSliderConfigControl::IntegerRangeSliderConfigControl(
                                             vlc_object_t *_p_this,
                                             module_config_t *_p_item,
-                                            QLabel *_label, QSlider *_slider,
-                                            bool *_bool          ) :
+                                            QLabel *_label, QSlider *_slider ):
                     VIntConfigControl( _p_this, _p_item )
 {
     slider = _slider;

diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index 31087439c86b3cde0a7f156966d3bc958f03c3df..eb2a75ca3d257eef018086860fa1d77887621f6d 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -130,7 +130,7 @@ class IntegerRangeSliderConfigControl : public VIntConfigControl
 {
 public:
     IntegerRangeSliderConfigControl( vlc_object_t *, module_config_t *,
-                                QLabel *, QSlider *, bool * );
+                                QLabel *, QSlider * );
     virtual ~IntegerRangeSliderConfigControl() {};
     virtual int getValue();
 protected:

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 7938b1d1fba905d335df349e16bd51579f42ee07..d2f6480bdb92d1fd3b4eb289792eb486f5cb005f 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -93,6 +93,17 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                 controls.append( control );                               \
             }
 
+#define CONFIG_GENERIC_NO_BOOL( option, type, label, qcontrol )           \
+            p_config =  config_FindConfig( VLC_OBJECT(p_intf), option );  \
+            if( p_config )                                                \
+            {                                                             \
+                control =  new type ## ConfigControl( VLC_OBJECT(p_intf), \
+                           p_config, label, ui.qcontrol );                \
+                controls.append( control );                               \
+            }
+
+
+
 #define START_SPREFS_CAT( name , label )    \
         case SPrefs ## name:                \
         {                                   \
@@ -162,8 +173,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 #endif
          CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
 
-       CONFIG_GENERIC( "volume" ,  IntegerRangeSlider, NULL, defaultVolume ); 
-
+         CONFIG_GENERIC_NO_BOOL( "volume" ,  IntegerRangeSlider, NULL, defaultVolume ); 
          CONFIG_GENERIC( "audio-language" , StringList , NULL, 
                     preferredAudioLanguage );  
          CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox );
@@ -172,21 +182,18 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 
          CONFIG_GENERIC( "aout" , Module , NULL, outputModule );
 #ifndef WIN32
-       CONFIG_GENERIC( "alsadev" , StringList , NULL, alsaDevice );
+         CONFIG_GENERIC( "alsadev" , StringList , NULL, alsaDevice );
          CONFIG_GENERIC( "dspdev" , String , NULL, OSSDevice );//FIXME File
 #else
-       CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL, 
+         CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL, 
                  DirectXDevice );
 #endif
          CONFIG_GENERIC( "audiofile-file" , String , NULL, FileName ); //Fixme File
 
-
          CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
-#if 0 // Not found for normalizer effect
-         CONFIG_GENERIC( "" , , NULL, );
-#endif
+//         CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer 
+         CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL, volNormalizer );
          CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
-
         END_SPREFS_CAT;
 
         START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings"  );