[vlmc-devel] commit: Commands: Fix clip splitting. ( Hugo Beauzée-Luyssen )

git at videolan.org git at videolan.org
Thu Aug 26 23:51:30 CEST 2010


vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Thu Aug 26 23:38:16 2010 +0200| [42656bc77ddc83188d71d29afc4e4ec16f3fcb8a] | committer: Hugo Beauzée-Luyssen 

Commands: Fix clip splitting.

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

 src/Commands/Commands.cpp |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/Commands/Commands.cpp b/src/Commands/Commands.cpp
index 0d1d03d..5525df6 100644
--- a/src/Commands/Commands.cpp
+++ b/src/Commands/Commands.cpp
@@ -31,6 +31,8 @@
 #ifdef WITH_GUI
 # include "UndoStack.h"
 
+#include <QtDebug>
+
 void Commands::trigger( QUndoCommand* command )
 {
     UndoStack::getInstance()->push( command );
@@ -176,8 +178,10 @@ Commands::MainWorkflow::SplitClip::~SplitClip()
 
 void    Commands::MainWorkflow::SplitClip::redo()
 {
+    //If we don't remove 1, the clip will end exactly at the starting frame (ie. they will
+    //be rendering at the same time)
+    m_toSplit->setEnd( m_newClipBegin - 1 );
     m_trackWorkflow->addClip( m_newClip, m_newClipPos );
-    m_toSplit->setEnd( m_newClipBegin );
 }
 
 void    Commands::MainWorkflow::SplitClip::undo()



More information about the Vlmc-devel mailing list