vlc | branch: master | Steve Lhomme <[email protected]> | Tue Jun 12 12:28:56 2018 +0200| [ddbe9b805c731d39c6e9b416baef66646238b294] | committer: Steve Lhomme
qt: adjust the second parameter of AtoBLoop to match the positionUpdated signal > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ddbe9b805c731d39c6e9b416baef66646238b294 --- modules/gui/qt/input_manager.cpp | 6 +++--- modules/gui/qt/input_manager.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/gui/qt/input_manager.cpp b/modules/gui/qt/input_manager.cpp index 97892ee877..78c2289745 100644 --- a/modules/gui/qt/input_manager.cpp +++ b/modules/gui/qt/input_manager.cpp @@ -953,20 +953,20 @@ void InputManager::setAtoB() timeB = var_GetInteger( p_mim->getInput(), "time" ); var_SetInteger( p_mim->getInput(), "time" , timeA ); CONNECT( this, positionUpdated( float, int64_t, int ), - this, AtoBLoop( float, int64_t, int ) ); + this, AtoBLoop( float, vlc_tick_t, int ) ); } else { timeA = 0; timeB = 0; disconnect( this, SIGNAL( positionUpdated( float, int64_t, int ) ), - this, SLOT( AtoBLoop( float, int64_t, int ) ) ); + this, SLOT( AtoBLoop( float, vlc_tick_t, int ) ) ); } emit AtoBchanged( (timeA != 0 ), (timeB != 0 ) ); } /* Function called regularly when in an AtoB loop */ -void InputManager::AtoBLoop( float, int64_t i_time, int ) +void InputManager::AtoBLoop( float, vlc_tick_t i_time, int ) { if( timeB && i_time >= timeB ) var_SetInteger( p_mim->getInput(), "time" , timeA ); diff --git a/modules/gui/qt/input_manager.hpp b/modules/gui/qt/input_manager.hpp index bd4b3d9b97..5c3f2b3dff 100644 --- a/modules/gui/qt/input_manager.hpp +++ b/modules/gui/qt/input_manager.hpp @@ -211,7 +211,7 @@ public slots: void setAtoB(); private slots: - void AtoBLoop( float, int64_t, int ); + void AtoBLoop( float, vlc_tick_t, int ); signals: /// Send new position, new time and new length _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
