Qt: simplify SpeedLabel constructor

Ref #3368

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index ba5b4a5535a6ff9a5f08a2d321015c16cc133f6c..058d427b8674bd6588a669de5311ded7dcc69aa1 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -412,9 +412,8 @@ void VisualSelector::next()
 }
 #endif
 
-SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, const QString& text,
-                        QWidget *parent )
-           : QLabel( text, parent ), p_intf( _p_intf )
+SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, QWidget *parent )
+           : QLabel( parent ), p_intf( _p_intf )
 {
     setToolTip( qtr( "Current playback speed.\nClick to adjust" ) );
 
@@ -431,6 +430,7 @@ SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, const QString& text,
 
     DCONNECT( THEMIM, inputChanged( input_thread_t * ),
               speedControl, activateOnState() );
+    setRate( INPUT_RATE_DEFAULT );
 }
 
 SpeedLabel::~SpeedLabel()

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index bda4143720c766751a9681c1ba216a1eb3bc7703..3d57e08c1220fd4685739014830fd8abfbe8501c 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -162,7 +162,7 @@ class SpeedLabel : public QLabel
 {
     Q_OBJECT
 public:
-    SpeedLabel( intf_thread_t *, const QString&, QWidget * );
+    SpeedLabel( intf_thread_t *, QWidget * );
     virtual ~SpeedLabel();
 
 protected:

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index c7f99405e8856d08cf46d1e2dda8c8c0409bc5db..9756cd540011f97a4bd7770612885a0e05d5094d 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -498,7 +498,7 @@ inline void MainInterface::createStatusBar()
     nameLabel = new QLabel( this );
     nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse
                                       | Qt::TextSelectableByKeyboard );
-    SpeedLabel *speedLabel = new SpeedLabel( p_intf, "1.00x", this );
+    SpeedLabel *speedLabel = new SpeedLabel( p_intf, this );
 
     /* Styling those labels */
     timeLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel );