From: <tt...@us...> - 2010-09-30 16:35:18
|
Revision: 4958 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4958&view=rev Author: ttill Date: 2010-09-30 16:35:12 +0000 (Thu, 30 Sep 2010) Log Message: ----------- Remove checks for inpoint < 0. Not needed anymore. Modified Paths: -------------- trunk/kdenlive/src/clipitem.cpp trunk/kdenlive/src/renderer.cpp Modified: trunk/kdenlive/src/clipitem.cpp =================================================================== --- trunk/kdenlive/src/clipitem.cpp 2010-09-29 22:13:12 UTC (rev 4957) +++ trunk/kdenlive/src/clipitem.cpp 2010-09-30 16:35:12 UTC (rev 4958) @@ -1422,14 +1422,8 @@ // special case: the affine effect needs in / out points if (effectId == "pan_zoom") { - int start = cropStart().frames(m_fps); - int end = (cropStart() + cropDuration()).frames(m_fps); - if (start < 0) { - end -= start; - start = 0; - } - parameters.addParam("in", QString::number(start)); - parameters.addParam("out", QString::number(end)); + parameters.addParam("in", QString::number(cropStart().frames(m_fps))); + parameters.addParam("out", QString::number((cropStart() + cropDuration()).frames(m_fps))); } QDomNodeList params = effect.elementsByTagName("parameter"); @@ -1792,10 +1786,6 @@ int in = cropStart().frames(fps()); int out = in + cropDuration().frames(fps()); - if (in < 0) { - out -= in; - in = 0; - } int dur = out - in - 1; effect.setAttribute("in", in); Modified: trunk/kdenlive/src/renderer.cpp =================================================================== --- trunk/kdenlive/src/renderer.cpp 2010-09-29 22:13:12 UTC (rev 4957) +++ trunk/kdenlive/src/renderer.cpp 2010-09-30 16:35:12 UTC (rev 4958) @@ -2801,11 +2801,7 @@ int newDuration = (int) clipDuration.frames(m_fps) - 1; int diff = newDuration - (trackPlaylist.clip_length(clipIndex) - 1); - int currentOut; - if (info.cropStart < GenTime()) - currentOut = newDuration - info.cropStart.frames(m_fps); - else - currentOut = newDuration + previousStart; + int currentOut = newDuration + previousStart; if (currentOut > clip->get_length()) { clip->parent().set("length", currentOut + 1); clip->parent().set("out", currentOut); @@ -2933,11 +2929,6 @@ m_isBlocked = true; previousStart += moveFrame; - if (previousStart < 0) { - // special case, in point becoming negative (resizing images) - previousOut -= previousStart; - previousStart = 0; - } int length = previousOut + 1; if (length > clip->get_length()) { @@ -2959,8 +2950,10 @@ if (! trackPlaylist.is_blank(blankIndex)) { kDebug() << "WARNING, CLIP TO RESIZE IS NOT BLANK"; } - if (blankLength + moveFrame == 0) trackPlaylist.remove(blankIndex); - else trackPlaylist.resize_clip(blankIndex, 0, blankLength + moveFrame - 1); + if (blankLength + moveFrame == 0) + trackPlaylist.remove(blankIndex); + else + trackPlaylist.resize_clip(blankIndex, 0, blankLength + moveFrame - 1); } trackPlaylist.consolidate_blanks(0); /*if (QString(clip->parent().get("transparency")).toInt() == 1) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |