[vlc-commits] Qt: InputManager: don't enforce lower bound after a seek

Francois Cartegnie git at videolan.org
Tue Nov 26 08:46:18 CET 2013


vlc/vlc-2.1 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Nov 25 13:41:58 2013 +0100| [50757f6ad12da09746b12ee0008139b853ff5e68] | committer: Jean-Baptiste Kempf

Qt: InputManager: don't enforce lower bound after a seek

Should fix problems like #2243.
After a seek, the updated position could be the keyframe position
choosen by demux, and then lower than A.

(cherry picked from commit 9baab2bdeb1667061b98399b407b7434f0dbb36e)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=50757f6ad12da09746b12ee0008139b853ff5e68
---

 modules/gui/qt4/input_manager.cpp |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index fdda7fd..2384170 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -951,11 +951,8 @@ void InputManager::setAtoB()
 /* Function called regularly when in an AtoB loop */
 void InputManager::AtoBLoop( float, int64_t i_time, int )
 {
-    if( timeB )
-    {
-        if( i_time >= timeB || i_time < timeA )
-            var_SetTime( THEMIM->getInput(), "time" , timeA );
-    }
+    if( timeB && i_time >= timeB )
+        var_SetTime( THEMIM->getInput(), "time" , timeA );
 }
 
 /**********************************************************************



More information about the vlc-commits mailing list