vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Jul 20 17:42:14 2012 +0300| [25040764f03603fd4706e66f77247fc6b80a84af] | committer: Rémi Denis-Courmont
Qt4: remove constant parameter > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=25040764f03603fd4706e66f77247fc6b80a84af --- modules/gui/qt4/components/controller_widget.cpp | 1 - modules/gui/qt4/util/input_slider.cpp | 4 ++-- modules/gui/qt4/util/input_slider.hpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp index a6bfc9e..61f9435 100644 --- a/modules/gui/qt4/components/controller_widget.cpp +++ b/modules/gui/qt4/components/controller_widget.cpp @@ -90,7 +90,6 @@ SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf, { volumeSlider = new SoundSlider( this, config_GetInt( p_intf, "volume-step" ), - false, var_InheritString( p_intf, "qt-slider-colours" ) ); } else diff --git a/modules/gui/qt4/util/input_slider.cpp b/modules/gui/qt4/util/input_slider.cpp index 6675e19..3eaa9ce 100644 --- a/modules/gui/qt4/util/input_slider.cpp +++ b/modules/gui/qt4/util/input_slider.cpp @@ -435,12 +435,12 @@ bool SeekSlider::isAnimationRunning() const #define SOUNDMIN 0 // % #define SOUNDMAX 200 // % OR 400 ? -SoundSlider::SoundSlider( QWidget *_parent, int _i_step, bool b_hard, +SoundSlider::SoundSlider( QWidget *_parent, int _i_step, char *psz_colors ) : QAbstractSlider( _parent ) { f_step = ( _i_step * 100 ) / AOUT_VOLUME_MAX ; - setRange( SOUNDMIN, b_hard ? (2 * SOUNDMAX) : SOUNDMAX ); + setRange( SOUNDMIN, SOUNDMAX ); setMouseTracking( true ); isSliding = false; b_mouseOutside = true; diff --git a/modules/gui/qt4/util/input_slider.hpp b/modules/gui/qt4/util/input_slider.hpp index 84d7f1a..2a60643 100644 --- a/modules/gui/qt4/util/input_slider.hpp +++ b/modules/gui/qt4/util/input_slider.hpp @@ -125,7 +125,7 @@ class SoundSlider : public QAbstractSlider { Q_OBJECT public: - SoundSlider( QWidget *_parent, int _i_step, bool b_softamp, char * ); + SoundSlider( QWidget *_parent, int _i_step, char * ); void setMuted( bool ); /* Set Mute status */ protected: _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
