Commit 9c902929 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

parent a63f8160
...@@ -823,18 +823,23 @@ void InputManager::setAtoB() ...@@ -823,18 +823,23 @@ void InputManager::setAtoB()
{ {
timeB = var_GetTime( THEMIM->getInput(), "time" ); timeB = var_GetTime( THEMIM->getInput(), "time" );
var_SetTime( THEMIM->getInput(), "time" , timeA ); var_SetTime( THEMIM->getInput(), "time" , timeA );
CONNECT( this, positionUpdated( float, int, int ),
this, AtoBLoop( float, int, int ) );
} }
else else
{ {
timeA = 0; timeA = 0;
timeB = 0; timeB = 0;
disconnect( this, SIGNAL( positionUpdated( float, int, int ) ),
this, SLOT( AtoBLoop( float, int, int ) ) );
} }
emit AtoBchanged( (timeA != 0 ), (timeB != 0 ) ); emit AtoBchanged( (timeA != 0 ), (timeB != 0 ) );
} }
/* Function called regularly when in an AtoB loop */ /* 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( timeB )
{ {
if( ( i_time >= (int)( timeB/1000000 ) ) if( ( i_time >= (int)( timeB/1000000 ) )
......
...@@ -136,7 +136,6 @@ private: ...@@ -136,7 +136,6 @@ private:
void UpdateCaching(); void UpdateCaching();
void UpdateRecord(); void UpdateRecord();
void AtoBLoop( int );
public slots: public slots:
void setInput( input_thread_t * ); ///< Our controlled input changed void setInput( input_thread_t * ); ///< Our controlled input changed
...@@ -163,6 +162,7 @@ public slots: ...@@ -163,6 +162,7 @@ public slots:
private slots: private slots:
void togglePlayPause(); void togglePlayPause();
void AtoBLoop( float, int, int );
signals: signals:
/// Send new position, new time and new length /// Send new position, new time and new length
......
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