From: <j-...@us...> - 2009-07-25 08:28:56
|
Revision: 3764 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3764&view=rev Author: j-b-m Date: 2009-07-25 08:28:45 +0000 (Sat, 25 Jul 2009) Log Message: ----------- Fix spacer bug (broken when removing a one frame zone) Modified Paths: -------------- trunk/kdenlive/src/renderer.cpp Modified: trunk/kdenlive/src/renderer.cpp =================================================================== --- trunk/kdenlive/src/renderer.cpp 2009-07-24 19:47:50 UTC (rev 3763) +++ trunk/kdenlive/src/renderer.cpp 2009-07-25 08:28:45 UTC (rev 3764) @@ -1679,7 +1679,11 @@ if (!trackPlaylist.is_blank(clipIndex)) clipIndex --; if (!trackPlaylist.is_blank(clipIndex)) kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos; int position = trackPlaylist.clip_start(clipIndex); - trackPlaylist.remove_region(position, - diff - 1); + int blankDuration = trackPlaylist.clip_length(clipIndex) - 1; + diff = -diff; + if (blankDuration - diff == 1) + trackPlaylist.remove(clipIndex); + else trackPlaylist.remove_region(position, diff - 1); } trackPlaylist.consolidate_blanks(0); } @@ -1736,7 +1740,10 @@ if (!trackPlaylist.is_blank(clipIndex)) clipIndex --; if (!trackPlaylist.is_blank(clipIndex)) kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos; int position = trackPlaylist.clip_start(clipIndex); - trackPlaylist.remove_region(position, - diff - 1); + int blankDuration = trackPlaylist.clip_length(clipIndex) - 1; + if (diff + blankDuration == 1) + trackPlaylist.remove(clipIndex); + else trackPlaylist.remove_region(position, - diff - 1); } trackPlaylist.consolidate_blanks(0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |