From: <j-...@us...> - 2008-11-10 21:25:13
|
Revision: 2662 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2662&view=rev Author: j-b-m Date: 2008-11-10 21:25:09 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Fix loading of effects with keyframes, should solve: http://www.kdenlive.org:80/mantis/view.php?id=333 Modified Paths: -------------- branches/KDE4/src/trackview.cpp Modified: branches/KDE4/src/trackview.cpp =================================================================== --- branches/KDE4/src/trackview.cpp 2008-11-10 20:47:07 UTC (rev 2661) +++ branches/KDE4/src/trackview.cpp 2008-11-10 21:25:09 UTC (rev 2662) @@ -401,7 +401,6 @@ for (int ix = 0; ix < effects.count(); ix++) { QDomElement effect = effects.at(ix).toElement(); if (effect.tagName() == "filter") { - kDebug() << " * * * * * * * * * * ** CLIP EFF FND * * * * * * * * * * *"; // add effect to clip QString effecttag; QString effectid; @@ -418,7 +417,7 @@ effectindex = effectparam.text(); } } - + //kDebug() << "+ + CLIP EFF FND: " << effecttag << ", " << effectid << ", " << effectindex; // get effect standard tags QDomElement clipeffect = MainWindow::customEffects.getEffectByTag(QString(), effectid); if (clipeffect.isNull()) clipeffect = MainWindow::videoEffects.getEffectByTag(effecttag, effectid); @@ -434,7 +433,7 @@ QDomNodeList clipeffectparams = currenteffect.childNodes(); if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) { - kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND * * * * * * * * * * *"; + //kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND * * * * * * * * * * *"; // effect is key-framable, read all effects to retrieve keyframes double factor; QString starttag; @@ -479,6 +478,7 @@ if (subeffectparam.attribute("name") == "kdenlive_ix" && subeffectparam.text() != effectindex) { //We are not in the same effect, stop parsing lastParsedEffect = n2.previousSibling(); + ix--; continueParsing = false; break; } else if (subeffectparam.attribute("name") == endtag) { @@ -486,8 +486,10 @@ break; } } - if (continueParsing) keyframes.append(QString::number(effectout) + ":" + QString::number(endvalue) + ";"); - ix++; + if (continueParsing) { + keyframes.append(QString::number(effectout) + ":" + QString::number(endvalue) + ";"); + ix++; + } } params = currenteffect.elementsByTagName("parameter"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |