[vlc-devel] commit: Qt: repair A->B loop and close #2558 (Jean-Baptiste Kempf )

git version control git at videolan.org
Fri Feb 27 01:34:36 CET 2009


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Feb 27 01:33:32 2009 +0100| [9c902929930dd435d96e41aac7d382f2fdfb1e97] | committer: Jean-Baptiste Kempf 

Qt: repair A->B loop and close #2558

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

 modules/gui/qt4/input_manager.cpp |    7 ++++++-
 modules/gui/qt4/input_manager.hpp |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index a38807e..53ad7b2 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -823,18 +823,23 @@ void InputManager::setAtoB()
     {
         timeB = var_GetTime( THEMIM->getInput(), "time"  );
         var_SetTime( THEMIM->getInput(), "time" , timeA );
+        CONNECT( this, positionUpdated( float, int, int ),
+                 this, AtoBLoop( float, int, int ) );
     }
     else
     {
         timeA = 0;
         timeB = 0;
+        disconnect( this, SIGNAL( positionUpdated( float, int, int ) ),
+                    this, SLOT( AtoBLoop( float, int, int ) ) );
     }
     emit AtoBchanged( (timeA != 0 ), (timeB != 0 ) );
 }
 
 /* Function called regularly when in an AtoB loop */
-void InputManager::AtoBLoop( int i_time )
+void InputManager::AtoBLoop( float, int i_time, int )
 {
+    msg_Dbg( p_intf, "I am here" );
     if( timeB )
     {
         if( ( i_time >= (int)( timeB/1000000 ) )
diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 19af8ac..69732e0 100644
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -136,7 +136,6 @@ private:
     void UpdateCaching();
     void UpdateRecord();
 
-    void AtoBLoop( int );
 
 public slots:
     void setInput( input_thread_t * ); ///< Our controlled input changed
@@ -163,6 +162,7 @@ public slots:
 
 private slots:
     void togglePlayPause();
+    void AtoBLoop( float, int, int );
 
 signals:
     /// Send new position, new time and new length




More information about the vlc-devel mailing list