Qt4 - MainInterface and InputManager: setRate actually shows something in the interface.

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 36459d6744bdbabee1221e1880e7684621184622..6f8e175ef1670d1ff4da6098608d211bf8aeb45c 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -100,8 +100,11 @@ void InputManager::update()
     i_time = var_GetTime( p_input, "time") / 1000000;
     f_pos = var_GetFloat( p_input, "position" );
     emit positionUpdated( f_pos, i_time, i_length );
+    
+    /* Update rate */
+    emit rateChanged( var_GetInteger( p_input, "rate") );
 
-    /* Update disc status */
+    /* Update navigation status */
     vlc_value_t val; val.i_int = 0;
     var_Change( p_input, "title", VLC_VAR_CHOICESCOUNT, &val, NULL );
     if( val.i_int > 0 )

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 816504246ce5a72a846d7f70d4899d80880b66eb..9e75acbb312e950651a443ce1f50d4bc6c3d46ee 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -60,6 +60,7 @@ public slots:
 signals:
     /// Send new position, new time and new length
     void positionUpdated( float , int, int );
+    void rateChanged( int );
     void nameChanged( QString );
     /// Used to signal whether we should show navigation buttons
     void navigationChanged( int );

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 09d88dd6a9b0ff3702504883e61cf3f7d448cbe1..f13303ee4ed8b8ede5f8f7ceba59345916957a07 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -183,8 +183,10 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     /* Connect the input manager to the GUI elements it manages */
     /* It is also connected to the control->slider, see the ControlsWidget */
     CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
-             this, setDisplay( float, int, int ) );
-
+             this, setDisplayPosition( float, int, int ) );
+    
+    CONNECT( THEMIM->getIM(), rateChanged( int ), this, setRate( int ) );
+    
     /** Connects on nameChanged() */
     /* Naming in the controller statusbar */
     CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
@@ -655,7 +657,7 @@ bool MainInterface::isAdvancedVisible()
 /************************************************************************
  * Other stuff
  ************************************************************************/
-void MainInterface::setDisplay( float pos, int time, int length )
+void MainInterface::setDisplayPosition( float pos, int time, int length )
 {
     char psz_length[MSTRTIME_MAX_SIZE], psz_time[MSTRTIME_MAX_SIZE];
     secstotimestr( psz_length, length );
@@ -686,6 +688,15 @@ void MainInterface::setStatus( int status )
         updateSystrayMenu( status );
 }
 
+void MainInterface::setRate( int rate )
+{
+    msg_Dbg( p_intf, "raaahhh %i", rate );
+    QString str;
+    str.setNum( ( 1000/(double)rate), 'f', 2 );
+    str.append( "x" );
+    speedLabel->setText( str );
+}
+
 void MainInterface::updateOnTimer()
 {
     /* \todo Make this event-driven */

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 797ce02b4b661ffe3c0e0b24372e923e7bb084c0..10904f1ed24b2001d599165de9bd782bb188008c 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -128,10 +128,12 @@ public slots:
     void toggleAdvanced();
 private slots:
     void updateOnTimer();
+
     void setStatus( int );
+    void setRate( int );
     void setName( QString );
     void setVLCWindowsTitle( QString title = "" );
-    void setDisplay( float, int, int );
+    void setDisplayPosition( float, int, int );
     void toggleTimeDisplay();
     void setElapsedTime();
     void setRemainTime();