[vlmc-devel] TrackWorkflow: use MainWorkflow::createClip when loadFromVariant()

Yikai Lu git at videolan.org
Wed Jun 1 18:15:12 CEST 2016


vlmc | branch: master | Yikai Lu <luyikei.qmltu at gmail.com> | Tue May 10 19:01:31 2016 +0900| [496812a2c43c5d7372f805a5dcf745fb7431e756] | committer: Hugo Beauzée-Luyssen

TrackWorkflow: use MainWorkflow::createClip when loadFromVariant()

Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> https://code.videolan.org/videolan/vlmc/commit/496812a2c43c5d7372f805a5dcf745fb7431e756
---

 src/Workflow/TrackWorkflow.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index ee74473..3cc5c90 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -496,14 +496,13 @@ TrackWorkflow::loadFromVariant( const QVariant &variant )
             return ;
         }
 
-        Clip* c = Core::instance()->library()->clip( uuid );
-        if ( c != nullptr )
-        {
-            Clip  *clip = new Clip( c, begin, end );
-            addClip( clip, startFrame );
+        Clip  *clip = Core::instance()->workflow()->createClip( QUuid( uuid ) );
+        if ( clip == nullptr )
+            continue ;
+        clip->setBoundaries( begin, end );
+        addClip( clip, startFrame );
 
-            clip->clipWorkflow()->loadFromVariant( m["filters"] );
-        }
+        clip->clipWorkflow()->loadFromVariant( m["filters"] );
     }
     EffectUser::loadFromVariant( variant.toMap()["filters"] );
 }



More information about the Vlmc-devel mailing list