connect(m_trackview, SIGNAL(updateTrackHeaders()), this, SLOT(slotRepaintTracks()));
parseDocument(m_doc->toXml());
- int error = m_doc->setSceneList();
- if (error == -1) *ok = false;
+ if (m_doc->setSceneList() == -1) *ok = false;
else *ok = true;
connect(m_trackview, SIGNAL(cursorMoved(int, int)), m_ruler, SLOT(slotCursorMoved(int, int)));
connect(m_trackview->horizontalScrollBar(), SIGNAL(valueChanged(int)), m_ruler, SLOT(slotMoveRuler(int)));
if (isWipeTransition) transitionId = "slide";
}
}
+
QDomElement base = MainWindow::transitions.getEffectByTag(mlt_service, transitionId).cloneNode().toElement();
- for (int k = 0; k < transitionparams.count(); k++) {
- p = transitionparams.item(k).toElement();
- if (!p.isNull()) {
- QString paramName = p.attribute("name");
- QString paramValue = p.text();
-
- QDomNodeList params = base.elementsByTagName("parameter");
- if (paramName != "a_track" && paramName != "b_track") for (int i = 0; i < params.count(); i++) {
- QDomElement e = params.item(i).toElement();
- if (!e.isNull() && e.attribute("tag") == paramName) {
- if (e.attribute("type") == "double") {
- QString factor = e.attribute("factor", "1");
- if (factor != "1") {
- double fact;
- if (factor.startsWith('%')) {
- fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
- } else fact = factor.toDouble();
- double val = paramValue.toDouble() * fact;
- paramValue = QString::number(val);
+ if (!base.isNull()) for (int k = 0; k < transitionparams.count(); k++) {
+ p = transitionparams.item(k).toElement();
+ if (!p.isNull()) {
+ QString paramName = p.attribute("name");
+ QString paramValue = p.text();
+
+ QDomNodeList params = base.elementsByTagName("parameter");
+ if (paramName != "a_track" && paramName != "b_track") for (int i = 0; i < params.count(); i++) {
+ QDomElement e = params.item(i).toElement();
+ if (!e.isNull() && e.attribute("tag") == paramName) {
+ if (e.attribute("type") == "double") {
+ QString factor = e.attribute("factor", "1");
+ if (factor != "1") {
+ double fact;
+ if (factor.startsWith('%')) {
+ fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+ } else fact = factor.toDouble();
+ double val = paramValue.toDouble() * fact;
+ paramValue = QString::number(val);
+ }
}
+ e.setAttribute("value", paramValue);
+ break;
}
- e.setAttribute("value", paramValue);
- break;
}
- }
+ }
}
- }
/*QDomDocument doc;
doc.appendChild(doc.importNode(base, true));
transitionInfo.track = m_projectTracks - 1 - b_track;
//kDebug() << "/////////////// +++++++++++ ADDING TRANSITION ON TRACK: " << b_track << ", TOTAL TRKA: " << m_projectTracks;
- if (transitionInfo.startPos >= transitionInfo.endPos) {
+ if (transitionInfo.startPos >= transitionInfo.endPos || base.isNull()) {
// invalid transition, remove it.
- m_documentErrors.append(i18n("Removed invalid transition: %1", e.attribute("id")) + '\n');
+ m_documentErrors.append(i18n("Removed invalid transition: (%1, %2, %3)", e.attribute("id"), mlt_service, transitionId) + '\n');
kDebug() << "///// REMOVED INVALID TRANSITION: " << e.attribute("id");
tractor.removeChild(transitions.item(i));
i--;
if (locked) item->setItemLocked(true);
clip->addReference();
position += (out - in + 1);
- kDebug() << "/////////\n\n\n" << "CLIP SPEED: " << speed << ", " << strobe << "\n\n\n/////////////////////";
if (speed != 1.0 || strobe > 1) {
QDomElement speedeffect = MainWindow::videoEffects.getEffectByTag(QString(), "speed").cloneNode().toElement();
EffectsList::setParameter(speedeffect, "speed", QString::number((int)(100 * speed + 0.5)));
// parse clip effects
QDomNodeList effects = elem.childNodes();
for (int ix = 0; ix < effects.count(); ix++) {
+ bool disableeffect = false;
QDomElement effect = effects.at(ix).toElement();
if (effect.tagName() == "filter") {
// add effect to clip
QString effecttag;
QString effectid;
- QString effectindex;
+ QString effectindex = QString::number(ix + 1);
QString ladspaEffectFile;
// Get effect tag & index
for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
effecttag = effectparam.text();
} else if (effectparam.attribute("name") == "kdenlive_id") {
effectid = effectparam.text();
+ } else if (effectparam.attribute("name") == "disable" && effectparam.text().toInt() == 1) {
+ // Fix effects index
+ disableeffect = true;
} else if (effectparam.attribute("name") == "kdenlive_ix") {
- effectindex = effectparam.text();
+ // Fix effects index
+ effectparam.firstChild().setNodeValue(effectindex);
} else if (effectparam.attribute("name") == "src") {
ladspaEffectFile = effectparam.text();
if (!QFile::exists(ladspaEffectFile)) {
QDomElement currenteffect = clipeffect.cloneNode().toElement();
currenteffect.setAttribute("kdenlive_ix", effectindex);
QDomNodeList clipeffectparams = currenteffect.childNodes();
-
+
if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) {
//kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND * * * * * * * * * * *";
// effect is key-framable, read all effects to retrieve keyframes
if (factor.startsWith('%')) {
fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
} else fact = factor.toDouble();
- if (e.attribute("type") == "simplekeyframe") {
- QStringList kfrs = paramvalue.split(";");
- for (int l = 0; l < kfrs.count(); l++) {
- QString fr = kfrs.at(l).section("=", 0, 0);
- double val = kfrs.at(l).section("=", 1, 1).toDouble();
- kfrs[l] = fr + ":" + QString::number((int) (val * fact));
- }
- e.setAttribute("keyframes", kfrs.join(";"));
- }
- else e.setAttribute("value", paramvalue.toDouble() * fact);
+ if (e.attribute("type") == "simplekeyframe") {
+ QStringList kfrs = paramvalue.split(";");
+ for (int l = 0; l < kfrs.count(); l++) {
+ QString fr = kfrs.at(l).section("=", 0, 0);
+ double val = kfrs.at(l).section("=", 1, 1).toDouble();
+ kfrs[l] = fr + ":" + QString::number((int)(val * fact));
+ }
+ e.setAttribute("keyframes", kfrs.join(";"));
+ } else e.setAttribute("value", paramvalue.toDouble() * fact);
} else e.setAttribute("value", paramvalue);
break;
}
}
currenteffect.setAttribute("src", ladspaEffectFile);
}
+ if (disableeffect) currenteffect.setAttribute("disable", "1");
item->addEffect(currenteffect, false);
- item->effectsCounter();
}
}
}