]> git.sesse.net Git - kdenlive/commitdiff
Don't keep playlist blocked when we have a problem deleting a clip
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 29 Jun 2009 17:34:33 +0000 (17:34 +0000)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 29 Jun 2009 17:34:33 +0000 (17:34 +0000)
svn path=/trunk/kdenlive/; revision=3695

src/renderer.cpp

index e1207dc21b8521318dbdd2ef3139c476eb5967aa..c82b41aebabb2a4d0e39746327716c5d663c3136 100644 (file)
@@ -1541,9 +1541,9 @@ bool Render::mltRemoveClip(int track, GenTime position)
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps));
 
-    /* // Display playlist info
-    kDebug()<<"////  BEFORE";
-    for (int i = 0; i < trackPlaylist.count(); i++) {
+    // Display playlist info
+    //kDebug() << "////  BEFORE -( " << position.frames(m_fps) << " )-------------------------------";
+    /*for (int i = 0; i < trackPlaylist.count(); i++) {
     int blankStart = trackPlaylist.clip_start(i);
     int blankDuration = trackPlaylist.clip_length(i) - 1;
     QString blk;
@@ -1552,8 +1552,10 @@ bool Render::mltRemoveClip(int track, GenTime position)
     }*/
     if (trackPlaylist.is_blank(clipIndex)) {
         kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << position.frames(25);
+        mlt_service_unlock(service.get_service());
         return false;
     }
+    //kDebug()<<"////  Deleting at: "<< (int) position.frames(m_fps) <<" --------------------------------------";
     m_isBlocked = true;
     trackPlaylist.replace_with_blank(clipIndex);
     trackPlaylist.consolidate_blanks(0);