Skip to content

V
vlc-2-2
Commit 9eb0513a authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

Revert "Qt4: don't reset rate when input changes" 

This reverts commit 21ad24ea.

I'll try to do it properly in core
parent 73ae1440
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
modules/gui/qt4/input_manager.cpp
View file @ 9eb0513a
...@@ -81,7 +81,7 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) : ...@@ -81,7 +81,7 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) :
artUrl = ""; artUrl = "";
p_input = NULL; p_input = NULL;
p_input_vbi = NULL; p_input_vbi = NULL;
f_rate = 1.; f_rate = 0.;
p_item = NULL; p_item = NULL;
b_video = false; b_video = false;
timeA = 0; timeA = 0;
...@@ -114,9 +114,7 @@ void InputManager::setInput( input_thread_t *_p_input ) ...@@ -114,9 +114,7 @@ void InputManager::setInput( input_thread_t *_p_input )
UpdateVout(); UpdateVout();
p_item = input_GetItem( p_input ); p_item = input_GetItem( p_input );
emit rateChanged( var_GetFloat( p_input, "rate" ) );
var_SetFloat( p_input, "rate", f_rate );
emit rateChanged( f_rate );
} }
else else
{ {
...@@ -143,6 +141,7 @@ void InputManager::delInput() ...@@ -143,6 +141,7 @@ void InputManager::delInput()
b_video = false; b_video = false;
timeA = 0; timeA = 0;
timeB = 0; timeB = 0;
f_rate = 0. ;
if( p_input_vbi ) if( p_input_vbi )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment