[vlmc-devel] commit: Use forward declarations (Hugo Beauzee-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzee-Luyssen <beauze.h at gmail.com> | Wed Mar 17 20:27:43 2010 +0100| [0eb0b103d52ace2f90f95635f042e7d1792f7429] | committer: Hugo Beauzee-Luyssen 

Use forward declarations

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

 src/Commands/Commands.h          |    1 -
 src/Gui/timeline/TracksScene.cpp |    1 +
 src/Gui/timeline/TracksView.cpp  |    1 +
 src/Workflow/TrackWorkflow.cpp   |    3 ++-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Commands/Commands.h b/src/Commands/Commands.h
index 684d6eb..fbe8cc0 100644
--- a/src/Commands/Commands.h
+++ b/src/Commands/Commands.h
@@ -27,7 +27,6 @@
 #include <QUndoCommand>
 #include <QObject>
 #include <QVector>
-#include "UndoStack.h"
 #include "MainWorkflow.h"
 
 class   Clip;
diff --git a/src/Gui/timeline/TracksScene.cpp b/src/Gui/timeline/TracksScene.cpp
index 0e2746e..3f8c9b9 100644
--- a/src/Gui/timeline/TracksScene.cpp
+++ b/src/Gui/timeline/TracksScene.cpp
@@ -27,6 +27,7 @@
 #include "GraphicsMovieItem.h"
 #include "GraphicsAudioItem.h"
 #include "Timeline.h"
+#include "UndoStack.h"
 
 TracksScene::TracksScene( QObject* parent ) : QGraphicsScene( parent )
 {
diff --git a/src/Gui/timeline/TracksView.cpp b/src/Gui/timeline/TracksView.cpp
index 8ccf012..9e061f2 100644
--- a/src/Gui/timeline/TracksView.cpp
+++ b/src/Gui/timeline/TracksView.cpp
@@ -30,6 +30,7 @@
 #include "GraphicsTrack.h"
 #include "Media.h"
 #include "WorkflowRenderer.h"
+#include "UndoStack.h"
 
 #include <QScrollBar>
 #include <QMouseEvent>
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index 1b6b70d..d0aed76 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -155,8 +155,9 @@ TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentFrame,
         cw->initialize();
         cw->waitForCompleteInit();
         //We check for a difference greater than one to avoid false positive when starting.
-        if ( (  qAbs(start - currentFrame) > 1 ) || cw->getClip()->begin() != 0 ) //Clip was not started as its real begining
+        if ( (  qAbs(start - currentFrame) > 1 ) || cw->getClip()->begin() != 0 )
         {
+            //Clip was not started as its real begining: adjust the position
             adjustClipTime( currentFrame, start, cw );
         }
         return cw->getOutput( mode );