Qt4 - Add an option to have the volume slider from 0 to 400 %. Close #952 Close ...

[vlc] / modules / gui / qt4 / components / interface_widgets.cpp

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index f95b3785bbbfec3e7e51e3d282f42520ed21b6eb..6ab38a191442a85df9c9f631b134f17e3e5f3ebc 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -495,12 +495,14 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, bool b_advControls ) :
     volMuteLabel->installEventFilter( hVolLabel );
     controlLayout->addWidget( volMuteLabel, 3, 15 );
 
-    volumeSlider = new SoundSlider( this );
+    volumeSlider = new SoundSlider( this, config_GetInt( p_intf, "qt-volume-complete" ) );
     volumeSlider->setMaximumSize( QSize( 200, 40 ) );
     volumeSlider->setMinimumSize( QSize( 80, 20 ) );
-    controlLayout->addWidget( volumeSlider, 3, 16, 1, 2 );
-    volumeSlider->setMaximum( VOLUME_MAX );
     volumeSlider->setFocusPolicy( Qt::NoFocus );
+    controlLayout->addWidget( volumeSlider, 3, 16, 1, 2 );
+    
+    /* Set the volume from the config */
+    volumeSlider->setValue( (config_GetInt( p_intf, "volume" ) )*  VOLUME_MAX / (AOUT_VOLUME_MAX/2) );
 
     /* Volume control connection */
     CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) );