[vlc-commits] commit: Revert "Qt4: don't reset rate when input changes" (Ilkka Ollakka )
git at videolan.org
git at videolan.org
Tue Sep 14 22:48:53 CEST 2010
vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Tue Sep 14 23:48:21 2010 +0300| [9eb0513ae6c3b98a1e111c85821809ac3415e03e] | committer: Ilkka Ollakka
Revert "Qt4: don't reset rate when input changes"
This reverts commit 21ad24ea6b641038a8a95d4a33b817fcfea02820.
I'll try to do it properly in core
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9eb0513ae6c3b98a1e111c85821809ac3415e03e
---
modules/gui/qt4/input_manager.cpp | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 516105c..ebcc032 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -81,7 +81,7 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) :
artUrl = "";
p_input = NULL;
p_input_vbi = NULL;
- f_rate = 1.;
+ f_rate = 0.;
p_item = NULL;
b_video = false;
timeA = 0;
@@ -114,9 +114,7 @@ void InputManager::setInput( input_thread_t *_p_input )
UpdateVout();
p_item = input_GetItem( p_input );
-
- var_SetFloat( p_input, "rate", f_rate );
- emit rateChanged( f_rate );
+ emit rateChanged( var_GetFloat( p_input, "rate" ) );
}
else
{
@@ -143,6 +141,7 @@ void InputManager::delInput()
b_video = false;
timeA = 0;
timeB = 0;
+ f_rate = 0. ;
if( p_input_vbi )
{
More information about the vlc-commits
mailing list