X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finiteffects.cpp;h=42e1d26bbc5ee9d3641317cb9fdc20e99b1cdb63;hb=0e9a1f923a067e05ba721722f9417547f9cd76da;hp=eb5270bf124496f5558e4be71e402c6582192cc5;hpb=6dd2a5a1044f566f1fe0fa5b6608218352b6f881;p=kdenlive
diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index eb5270bf..42e1d26b 100644
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -65,7 +65,6 @@ initEffectsThumbnailer initEffects::thumbnailer;
// static
void initEffects::refreshLumas()
{
-
// Check for Kdenlive installed luma files, add empty string at start for no luma
QStringList imagenamelist = QStringList() << i18n("None");
QStringList imagefiles = QStringList() << QString();
@@ -90,7 +89,7 @@ void initEffects::refreshLumas()
imagenamelist.append(fname);
imagefiles.append(folder + '/' + fname);
}
- QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", QString());
+ QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", "luma");
QDomNodeList params = lumaTransition.elementsByTagName("parameter");
for (int i = 0; i < params.count(); i++) {
QDomElement e = params.item(i).toElement();
@@ -101,6 +100,17 @@ void initEffects::refreshLumas()
}
}
+ QDomElement compositeTransition = MainWindow::transitions.getEffectByTag("composite", "composite");
+ params = compositeTransition.elementsByTagName("parameter");
+ for (int i = 0; i < params.count(); i++) {
+ QDomElement e = params.item(i).toElement();
+ if (e.attribute("tag") == "luma") {
+ e.setAttribute("paramlistdisplay", imagenamelist.join(","));
+ e.setAttribute("paramlist", imagefiles.join(","));
+ break;
+ }
+ }
+
}
@@ -184,10 +194,12 @@ Mlt::Repository *initEffects::parseEffectFiles()
KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/local/lib/ladspa");
KGlobal::dirs()->addResourceDir("ladspa_plugin", "/opt/lib/ladspa");
KGlobal::dirs()->addResourceDir("ladspa_plugin", "/opt/local/lib/ladspa");
+ KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/lib64/ladspa");
+ KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/local/lib64/ladspa");
kDebug() << "// INIT EFFECT SEARCH" << endl;
- QStringList direc = KGlobal::dirs()->findDirs("data", "kdenlive/effects");
+ QStringList direc = KGlobal::dirs()->findDirs("appdata", "effects");
QDir directory;
for (more = direc.begin() ; more != direc.end() ; ++more) {
@@ -655,9 +667,9 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
}
if (name == "luma") {
-
- tname.appendChild(ret.createTextNode("Luma"));
- desc.appendChild(ret.createTextNode("Applies a luma transition between the current and next frames"));
+ ktrans.setAttribute("id", name);
+ tname.appendChild(ret.createTextNode("Wipe"));
+ desc.appendChild(ret.createTextNode("Applies a stationary transition between the current and next frames"));
paramList.append(quickParameterFill(ret, "Softness", "softness", "double", "0", "0", "100", "", "", "100"));
paramList.append(quickParameterFill(ret, "Invert", "invert", "bool", "0", "0", "1"));
@@ -672,13 +684,12 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
paramList.append(quickParameterFill(ret, "Align", "aligned", "bool", "1", "0", "1"));
paramList.append(quickParameterFill(ret, "Fill", "fill", "bool", "0", "0", "1"));
paramList.append(quickParameterFill(ret, "Distort", "distort", "bool", "0", "0", "1"));
- paramList.append(quickParameterFill(ret, "Luma Image File", "luma", "list", "", "", "", imagefiles.join(","), imagenamelist.join(",")));
- paramList.append(quickParameterFill(ret, "Luma Softness", "softness", "double", "0", "0", "100", "", "", "100"));
- paramList.append(quickParameterFill(ret, "Luma Invert", "luma_invert", "bool", "0", "0", "1"));
+ paramList.append(quickParameterFill(ret, "Wipe File", "luma", "list", "", "", "", imagefiles.join(","), imagenamelist.join(",")));
+ paramList.append(quickParameterFill(ret, "Wipe Softness", "softness", "double", "0", "0", "100", "", "", "100"));
+ paramList.append(quickParameterFill(ret, "Wipe Invert", "luma_invert", "bool", "0", "0", "1"));
paramList.append(quickParameterFill(ret, "Force Progressive Rendering", "progressive", "bool", "1", "0", "1"));
paramList.append(quickParameterFill(ret, "Force Deinterlace Overlay", "deinterlace", "bool", "0", "0", "1"));
tname.appendChild(ret.createTextNode("Composite"));
-
ktrans.setAttribute("id", "composite");
/*QDomDocument ret1;
QDomElement ktrans1 = ret1.createElement("ktransition");
@@ -724,18 +735,23 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
transitions->append(ret.documentElement());
//kDebug() << "//// //// TRANSITON XML";
- // kDebug() << ret.toString();
+ //kDebug() << ret.toString();
/*
*/
}
- QString wipetrans = "WipeSlide image from one side to anotherDirection Align";
+ QString slidetrans = "SlideSlide image from one side to anotherDirection AlignForce Progressive RenderingForce Deinterlace OverlayInvert";
QDomDocument ret;
- ret.setContent(wipetrans);
+ ret.setContent(slidetrans);
transitions->append(ret.documentElement());
+ QString dissolve = "DissolveFade out one video while fading in the other videoReverse";
+ QDomDocument dissolveDoc;
+ dissolveDoc.setContent(dissolve);
+ transitions->append(dissolveDoc.documentElement());
+
/*QString alphatrans = "Alpha transparencyMake alpha channel transparentDirectionRescaleAlign";
QDomDocument ret2;
ret2.setContent(alphatrans);