[vlmc-devel] commit: TrackWorkflow: Give the ClipWorkflow's current frame in Clip frame. ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Fri Sep 24 15:03:40 2010 +0200| [a87ee053b414d1d63338981fda1a1c978d43ac03] | committer: Hugo Beauzée-Luyssen 

TrackWorkflow: Give the ClipWorkflow's current frame in Clip frame.

If frame 0 is the clip first frame, even if the clip starts at the frame
X in the MainWorkflow

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=a87ee053b414d1d63338981fda1a1c978d43ac03
---

 src/Workflow/TrackWorkflow.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index 0359bac..15af00b 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -184,7 +184,7 @@ TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentFrame,
 
         if ( cw->isResyncRequired() == true || needRepositioning == true )
             adjustClipTime( currentFrame, start, cw );
-        return cw->getOutput( mode, currentFrame );
+        return cw->getOutput( mode, currentFrame - start );
     }
     else if ( cw->getState() == ClipWorkflow::Stopped )
     {
@@ -199,7 +199,7 @@ TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentFrame,
             //Clip was not started at its real begining: adjust the position
             adjustClipTime( currentFrame, start, cw );
         }
-        return cw->getOutput( mode, currentFrame );
+        return cw->getOutput( mode, currentFrame - start );
     }
     else if ( cw->getState() == ClipWorkflow::EndReached ||
               cw->getState() == ClipWorkflow::Muted ||