[vlc-commits] commit: Qt: display the correct rate (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Mar  2 16:53:11 2010 +0100| [6894acd77779454199d47a2c5c7a36ccf8278db0] | committer: Jean-Baptiste Kempf 

Qt: display the correct rate

Close #3368

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6894acd77779454199d47a2c5c7a36ccf8278db0
---

 modules/gui/qt4/components/interface_widgets.cpp |    2 +-
 modules/gui/qt4/input_manager.cpp                |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 058d427..07d68e6 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -430,7 +430,7 @@ SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, QWidget *parent )
 
     DCONNECT( THEMIM, inputChanged( input_thread_t * ),
               speedControl, activateOnState() );
-    setRate( INPUT_RATE_DEFAULT );
+    setRate( INPUT_RATE_DEFAULT / var_InheritFloat( p_intf, "rate" ) );
 }
 
 SpeedLabel::~SpeedLabel()
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index a648feb..42e46dd 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -117,7 +117,7 @@ void InputManager::setInput( input_thread_t *_p_input )
         p_input = NULL;
         p_item = NULL;
         assert( !p_input_vbi );
-        emit rateChanged( INPUT_RATE_DEFAULT );
+        emit rateChanged( INPUT_RATE_DEFAULT / var_InheritFloat( p_intf, "rate" ) );
     }
 }
 
@@ -148,7 +148,7 @@ void InputManager::delInput()
     p_input = NULL;
 
     emit positionUpdated( -1.0, 0 ,0 );
-    emit rateChanged( INPUT_RATE_DEFAULT ); /* TODO: Do we want this ? */
+    emit rateChanged( INPUT_RATE_DEFAULT / var_InheritFloat( p_intf, "rate" ) );
     emit nameChanged( "" );
     emit chapterChanged( 0 );
     emit titleChanged( 0 );
@@ -587,7 +587,7 @@ void InputManager::UpdateCaching()
     if( f_newCache != f_cache )
     {
         f_cache = f_newCache;
-        /* Update rate */
+        /* Update cache */
         emit cachingChanged( f_cache );
     }
 }