Commit e088c92b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

parent ec37e0e7
...@@ -551,8 +551,7 @@ void IntegerRangeConfigControl::finish() ...@@ -551,8 +551,7 @@ void IntegerRangeConfigControl::finish()
IntegerRangeSliderConfigControl::IntegerRangeSliderConfigControl( IntegerRangeSliderConfigControl::IntegerRangeSliderConfigControl(
vlc_object_t *_p_this, vlc_object_t *_p_this,
module_config_t *_p_item, module_config_t *_p_item,
QLabel *_label, QSlider *_slider, QLabel *_label, QSlider *_slider ):
bool *_bool ) :
VIntConfigControl( _p_this, _p_item ) VIntConfigControl( _p_this, _p_item )
{ {
slider = _slider; slider = _slider;
......
...@@ -130,7 +130,7 @@ class IntegerRangeSliderConfigControl : public VIntConfigControl ...@@ -130,7 +130,7 @@ class IntegerRangeSliderConfigControl : public VIntConfigControl
{ {
public: public:
IntegerRangeSliderConfigControl( vlc_object_t *, module_config_t *, IntegerRangeSliderConfigControl( vlc_object_t *, module_config_t *,
QLabel *, QSlider *, bool * ); QLabel *, QSlider * );
virtual ~IntegerRangeSliderConfigControl() {}; virtual ~IntegerRangeSliderConfigControl() {};
virtual int getValue(); virtual int getValue();
protected: protected:
......
...@@ -93,6 +93,17 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -93,6 +93,17 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
controls.append( control ); \ 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 ) \ #define START_SPREFS_CAT( name , label ) \
case SPrefs ## name: \ case SPrefs ## name: \
{ \ { \
...@@ -162,8 +173,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -162,8 +173,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
#endif #endif
CONFIG_GENERIC( "audio", Bool, NULL, enableAudio ); 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, CONFIG_GENERIC( "audio-language" , StringList , NULL,
preferredAudioLanguage ); preferredAudioLanguage );
CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox ); CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox );
...@@ -172,21 +182,18 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -172,21 +182,18 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "aout" , Module , NULL, outputModule ); CONFIG_GENERIC( "aout" , Module , NULL, outputModule );
#ifndef WIN32 #ifndef WIN32
CONFIG_GENERIC( "alsadev" , StringList , NULL, alsaDevice ); CONFIG_GENERIC( "alsadev" , StringList , NULL, alsaDevice );
CONFIG_GENERIC( "dspdev" , String , NULL, OSSDevice );//FIXME File CONFIG_GENERIC( "dspdev" , String , NULL, OSSDevice );//FIXME File
#else #else
CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL, CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL,
DirectXDevice ); DirectXDevice );
#endif #endif
CONFIG_GENERIC( "audiofile-file" , String , NULL, FileName ); //Fixme File CONFIG_GENERIC( "audiofile-file" , String , NULL, FileName ); //Fixme File
CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect ); CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
#if 0 // Not found for normalizer effect // CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer
CONFIG_GENERIC( "" , , NULL, ); CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL, volNormalizer );
#endif
CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation); CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
END_SPREFS_CAT; END_SPREFS_CAT;
START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings" ); START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings" );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment