X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finiteffects.cpp;h=5fcc8dcf05866ba6dbb3ed8fd4d928ed1054f4e2;hb=17121a7601e2c5e57127536dbd0f93e17e7b80f2;hp=e3fe464f72f46e36f5cfe2f6fe53235a0f6d4de9;hpb=1e007c2d73386e714ed480aba390b827e181994a;p=kdenlive
diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index e3fe464f..5fcc8dcf 100644
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -185,17 +185,6 @@ Mlt::Repository *initEffects::parseEffectFiles()
// Fill transitions list.
fillTransitionsList(repository, &MainWindow::transitions, transitionsItemList);
- //WARNING: deprecated, we now use MLT to detect LADSPA filters
- /*
- // Set the directories to look into for ladspa plugins.
- KGlobal::dirs()->addResourceType("ladspa_plugin", 0, "lib/ladspa");
- KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/lib/ladspa");
- 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");*/
-
// Remove blacklisted effects from the filters list.
QStringList mltFiltersList = filtersList;
QFile file2(KStandardDirs::locate("appdata", "blacklisted_effects.txt"));
@@ -227,7 +216,7 @@ Mlt::Repository *initEffects::parseEffectFiles()
// Create transitions
for (int i = 0; i < MainWindow::transitions.count(); ++i) {
effectInfo = MainWindow::transitions.at(i);
- effectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo);
+ effectsMap.insert(effectInfo.firstChildElement("name").text().toLower().toUtf8().data(), effectInfo);
}
MainWindow::transitions.clearList();
foreach(const QDomElement & effect, effectsMap)
@@ -241,16 +230,16 @@ Mlt::Repository *initEffects::parseEffectFiles()
if (!doc.isNull() && doc.elementsByTagName("parameter").count() > 0) {
if (doc.documentElement().attribute("type") == "audio") {
if (doc.elementsByTagName("description").count() > 0) {
- QString desc = doc.documentElement().elementsByTagName("description").item(0).toElement().text();
+ QString desc = doc.documentElement().firstChildElement("description").text();
//WARNING: TEMPORARY FIX for unusable MLT SOX parameters description
if (desc.startsWith("Process audio using a SoX")) {
// Remove MLT's SOX generated effects since the parameters properties are unusable for us
}
- else audioEffectsMap.insert(doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), doc.documentElement());
+ else audioEffectsMap.insert(doc.documentElement().firstChildElement("name").text().toLower().toUtf8().data(), doc.documentElement());
}
}
else
- videoEffectsMap.insert(doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), doc.documentElement());
+ videoEffectsMap.insert(doc.documentElement().firstChildElement("name").text().toLower().toUtf8().data(), doc.documentElement());
}
}
@@ -274,7 +263,7 @@ Mlt::Repository *initEffects::parseEffectFiles()
// Create custom effects
for (int i = 0; i < MainWindow::customEffects.count(); ++i) {
effectInfo = MainWindow::customEffects.at(i);
- effectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo);
+ effectsMap.insert(effectInfo.firstChildElement("name").text().toLower().toUtf8().data(), effectInfo);
}
MainWindow::customEffects.clearList();
foreach(const QDomElement & effect, effectsMap)
@@ -284,7 +273,7 @@ Mlt::Repository *initEffects::parseEffectFiles()
// Create audio effects
for (int i = 0; i < MainWindow::audioEffects.count(); ++i) {
effectInfo = MainWindow::audioEffects.at(i);
- audioEffectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo);
+ audioEffectsMap.insert(effectInfo.firstChildElement("name").text().toLower().toUtf8().data(), effectInfo);
}
MainWindow::audioEffects.clearList();
foreach(const QDomElement & effect, audioEffectsMap)
@@ -293,7 +282,7 @@ Mlt::Repository *initEffects::parseEffectFiles()
// Create video effects
for (int i = 0; i < MainWindow::videoEffects.count(); ++i) {
effectInfo = MainWindow::videoEffects.at(i);
- videoEffectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo);
+ videoEffectsMap.insert(effectInfo.firstChildElement("name").text().toLower().toUtf8().data(), effectInfo);
}
MainWindow::videoEffects.clearList();
foreach(const QDomElement & effect, videoEffectsMap)
@@ -334,7 +323,7 @@ void initEffects::parseCustomEffectsFile()
kDebug() << "More than one effect in file " << itemName << ", not supported yet";
} else {
e = effects.item(0).toElement();
- effectsMap.insert(e.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), e);
+ effectsMap.insert(e.firstChildElement("name").text().toLower().toUtf8().data(), e);
}
}
foreach(const QDomElement & effect, effectsMap)
@@ -348,16 +337,17 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *au
QFile file(name);
doc.setContent(&file, false);
file.close();
- QDomElement documentElement = doc.documentElement();
+ QDomElement documentElement;
QDomNodeList effects = doc.elementsByTagName("effect");
if (effects.count() == 0) {
kDebug() << "Effect broken: " << name;
return;
}
- QLocale locale;
+
bool needsLocaleConversion = false;
for (int i = 0; !effects.item(i).isNull(); ++i) {
+ QLocale locale;
documentElement = effects.item(i).toElement();
QString tag = documentElement.attribute("tag", QString());
if (documentElement.hasAttribute("LC_NUMERIC")) {
@@ -367,18 +357,7 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *au
needsLocaleConversion = true;
}
}
- if (documentElement.hasAttribute("version")) {
- // a specific version of the filter is required
- Mlt::Properties *metadata = repository->metadata(filter_type, tag.toUtf8().data());
- if (metadata && metadata->is_valid()) {
- double version = metadata->get_double("version");
- if (locale.toDouble(documentElement.attribute("version")) > version) {
- delete metadata;
- return;
- }
- }
- delete metadata;
- }
+ locale.setNumberOptions(QLocale::OmitGroupSeparator);
if (needsLocaleConversion) {
// we need to convert all numbers to the system's locale (for example 0.5 -> 0,5)
@@ -400,6 +379,25 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *au
}
}
+ double version = -1;
+ Mlt::Properties *metadata = repository->metadata(filter_type, tag.toUtf8().data());
+ if (metadata && metadata->is_valid()) {
+ version = metadata->get_double("version");
+ }
+ if (metadata) delete metadata;
+ if (documentElement.hasAttribute("version")) {
+ // a specific version of the filter is required
+ if (locale.toDouble(documentElement.attribute("version")) > version) {
+ return;
+ }
+ }
+ if (version > -1) {
+ // Add version info to XML
+ QDomNode versionNode = doc.createElement("version");
+ versionNode.appendChild(doc.createTextNode(QLocale().toString(version)));
+ documentElement.appendChild(versionNode);
+ }
+
// Parse effect information.
if ((filtersList.contains(tag) || producersList.contains(tag))) {
QString type = documentElement.attribute("type", QString());
@@ -410,213 +408,9 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *au
else
videoEffectList->append(documentElement);
}
-
- /*
- QDomNode n = documentElement.firstChild();
- QString id, effectName, effectTag, paramType;
- int paramCount = 0;
- EFFECTTYPE type;
-
- // Create Effect
- EffectParamDescFactory effectDescParamFactory;
- EffectDesc *effect = NULL;
-
- // parse effect file
- QDomNode namenode = documentElement.elementsByTagName("name").item(0);
- if (!namenode.isNull()) effectName = i18n(namenode.toElement().text());
- if (!groupName.isEmpty()) effectName.prepend("_" + groupName + "_");
-
- QDomNode propsnode = documentElement.elementsByTagName("properties").item(0);
- if (!propsnode.isNull()) {
- QDomElement propselement = propsnode.toElement();
- id = propselement.attribute("id", QString());
- effectTag = propselement.attribute("tag", QString());
- if (propselement.attribute("type", QString()) == "audio") type = AUDIOEFFECT;
- else if (propselement.attribute("type", QString()) == "custom") type = CUSTOMEFFECT;
- else type = VIDEOEFFECT;
- }
-
- QString effectDescription;
- QDomNode descnode = documentElement.elementsByTagName("description").item(0);
- if (!descnode.isNull()) effectDescription = descnode.toElement().text() + "
";
-
- QString effectAuthor;
- QDomNode authnode = documentElement.elementsByTagName("author").item(0);
- if (!authnode.isNull()) effectAuthor = authnode.toElement().text() + "
";
-
- if (effectName.isEmpty() || id.isEmpty() || effectTag.isEmpty()) return;
-
- effect = new EffectDesc(effectName, id, effectTag, effectDescription, effectAuthor, type);
-
- QDomNodeList paramList = documentElement.elementsByTagName("parameter");
- if (paramList.count() == 0) {
- QDomElement fixed = doc.createElement("parameter");
- fixed.setAttribute("type", "fixed");
- effect->addParameter(effectDescParamFactory.createParameter(fixed));
- }
- else for (int i = 0; i < paramList.count(); i++) {
- QDomElement e = paramList.item(i).toElement();
- if (!e.isNull()) {
- paramCount++;
- QDomNamedNodeMap attrs = e.attributes();
- int i = 0;
- QString value;
- while (!attrs.item(i).isNull()) {
- QDomNode n = attrs.item(i);
- value = n.nodeValue();
- if (value.find("MAX_WIDTH") != -1)
- value.replace("MAX_WIDTH", QString::number(KdenliveSettings::defaultwidth()));
- if (value.find("MID_WIDTH") != -1)
- value.replace("MID_WIDTH", QString::number(KdenliveSettings::defaultwidth() / 2));
- if (value.find("MAX_HEIGHT") != -1)
- value.replace("MAX_HEIGHT", QString::number(KdenliveSettings::defaultheight()));
- if (value.find("MID_HEIGHT") != -1)
- value.replace("MID_HEIGHT", QString::number(KdenliveSettings::defaultheight() / 2));
- n.setNodeValue(value);
- i++;
- }
- effect->addParameter(effectDescParamFactory.createParameter(e));
- }
- }
- effectList->append(effect);
- }*/
}
}
-//static
-const char* initEffects::ladspaEffectString(int ladspaId, QStringList params)
-{
- if (ladspaId == 1433) //Pitch
- return ladspaPitchEffectString(params);
- else if (ladspaId == 1216) //Room Reverb
- return ladspaRoomReverbEffectString(params);
- else if (ladspaId == 1423) //Reverb
- return ladspaReverbEffectString(params);
- else if (ladspaId == 1901) //Reverb
- return ladspaEqualizerEffectString(params);
- else {
- kDebug() << "++++++++++ ASKING FOR UNKNOWN LADSPA EFFECT: " << ladspaId << endl;
- return "";
- }
-}
-
-//static
-void initEffects::ladspaEffectFile(const QString & fname, int ladspaId, QStringList params)
-{
- const char *filterString;
- switch (ladspaId) {
- case 1433: //Pitch
- filterString = ladspaPitchEffectString(params);
- break;
- case 1905: //Vinyl
- filterString = ladspaVinylEffectString(params);
- break;
- case 1216 : //Room Reverb
- filterString = ladspaRoomReverbEffectString(params);
- break;
- case 1423: //Reverb
- filterString = ladspaReverbEffectString(params);
- break;
- case 1195: //Declipper
- filterString = ladspaDeclipEffectString(params);
- break;
- case 1901: //Reverb
- filterString = ladspaEqualizerEffectString(params);
- break;
- case 1913: // Limiter
- filterString = ladspaLimiterEffectString(params);
- break;
- case 1193: // Pitch Shifter
- filterString = ladspaPitchShifterEffectString(params);
- break;
- case 1417: // Rate Scaler
- filterString = ladspaRateScalerEffectString(params);
- break;
- case 1217: // Phaser
- filterString = ladspaPhaserEffectString(params);
- break;
- case 1197: // 15 Band Equalizer
- filterString = ladspaEqualizer15EffectString(params);
- break;
- default:
- kDebug() << "++++++++++ ASKING FOR UNKNOWN LADSPA EFFECT: " << ladspaId << endl;
- return;
- break;
- }
-
- QFile f(fname);
- if (f.open(QIODevice::WriteOnly)) {
- QTextStream stream(&f);
- stream << filterString;
- f.close();
- } else kDebug() << "++++++++++ ERROR CANNOT WRITE TO: " << KdenliveSettings::currenttmpfolder() + fname << endl;
- delete [] filterString;
-}
-
-const QString jackString = "248000";
-
-
-const char* initEffects::ladspaDeclipEffectString(QStringList)
-{
- return qstrdup(QString(jackString + "1195truefalsetrue1.0000001.000000true").toUtf8());
-}
-
-/*
-const char* initEffects::ladspaVocoderEffectString(QStringList params)
-{
- return qstrdup( QString(jackString + "1441truefalsetrue1.0000001.000000truetrue0.0000000.000000true%1%1true%1%1true%1%1true%1%1true%2%2true%2%2true%2%2true%2%2true%3%3true%3%3true%3%3true%3%3true%4%4true%4%4true%4%4true%4%4").arg(params[0]).arg(params[1]).arg(params[2]).arg(params[3]));
-}*/
-
-const char* initEffects::ladspaVinylEffectString(QStringList params)
-{
- return qstrdup(QString(jackString + "1905truefalsetrue1.0000001.000000%1%2%3%4%5").arg(params[0]).arg(params[1]).arg(params[2]).arg(params[3]).arg(params[4]).toUtf8());
-}
-
-const char* initEffects::ladspaPitchEffectString(QStringList params)
-{
- return qstrdup(QString(jackString + "1433truefalsetrue1.01.0truetrue%1%1true4.0000004.000000").arg(params[0]).toUtf8());
-}
-
-const char* initEffects::ladspaRoomReverbEffectString(QStringList params)
-{
- return qstrdup(QString(jackString + "1216truefalsetrue1.0000001.000000truetrue%1%1true%2%2true%3%3true0.7500000.750000true-70.000000-70.000000true0.0000000.000000true-17.500000-17.500000").arg(params[0]).arg(params[1]).arg(params[2]).toUtf8());
-}
-
-const char* initEffects::ladspaReverbEffectString(QStringList params)
-{
- return qstrdup(QString(jackString + "1423true falsetrue 1.0000001.000000 truetrue%1 %1true%2%2true0.2500000.250000").arg(params[0]).arg(params[1]).toUtf8());
-}
-
-const char* initEffects::ladspaEqualizerEffectString(QStringList params)
-{
- return qstrdup(QString(jackString + "1901true falsetrue 1.0000001.000000%1%2 %3").arg(params[0]).arg(params[1]).arg(params[2]).toUtf8());
-}
-
-const char* initEffects::ladspaLimiterEffectString(QStringList params)
-{
- return qstrdup(QString(jackString + "1913truefalsetrue1.0000001.000000%1%2%3").arg(params[0]).arg(params[1]).arg(params[2]).toUtf8());
-}
-
-const char* initEffects::ladspaPitchShifterEffectString(QStringList params)
-{
- return qstrdup(QString(jackString + "1193truefalsetrue1.0000001.000000truetrue%1%1").arg(params[0]).toUtf8());
-}
-
-const char* initEffects::ladspaRateScalerEffectString(QStringList params)
-{
- return qstrdup(QString(jackString + "1417truefalsetrue1.0000001.000000truetrue%1%1").arg(params[0]).toUtf8());
-}
-
-const char* initEffects::ladspaPhaserEffectString(QStringList params)
-{
- return qstrdup(QString(jackString + "1217truefalsetrue1.0000001.000000truetrue%1%1true%2%2true%3%3true%4%4").arg(params[0]).arg(params[1]).arg(params[2]).arg(params[3]).toUtf8());
-}
-const char* initEffects::ladspaEqualizer15EffectString(QStringList params)
-{
- return qstrdup(QString(jackString + "1197truefalsetrue1.0000001.000000truetrue%1%1true%2%2true%3%3true%4%4true%5%5true%6%6true%7%7true%8%8true%9%9true%10%10true%11%11true%12%12true%13%13true%14%14true%15%15").arg(params[0]).arg(params[1]).arg(params[2]).arg(params[3]).arg(params[4]).arg(params[5]).arg(params[6]).arg(params[7]).arg(params[8]).arg(params[9]).arg(params[10]).arg(params[11]).arg(params[12]).arg(params[13]).arg(params[14]).toUtf8());
-}
-
-
QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, const QString& /*type*/, const QString& filtername)
{
@@ -640,9 +434,13 @@ QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository,
QDomElement author = ret.createElement("author");
author.appendChild(ret.createTextNode(metadata->get("creator")));
+ QDomElement version = ret.createElement("version");
+ version.appendChild(ret.createTextNode(metadata->get("version")));
+
eff.appendChild(name);
eff.appendChild(author);
eff.appendChild(desc);
+ eff.appendChild(version);
Mlt::Properties tags((mlt_properties) metadata->get_data("tags"));
if (QString(tags.get(0)) == "Audio") eff.setAttribute("type", "audio");
@@ -852,9 +650,9 @@ void initEffects::fillTransitionsList(Mlt::Repository *repository, EffectsList *
/*paramList.append(quickParameterFill(ret, i18n("Rotate Y"), "rotate_y", "simplekeyframe", "0", "-1800", "1800", QString(), QString(), "10"));
paramList.append(quickParameterFill(ret, i18n("Rotate Z"), "rotate_z", "simplekeyframe", "0", "-1800", "1800", QString(), QString(), "10"));*/
- paramList.append(quickParameterFill(ret, i18n("Fix Shear Y"), "fix_shear_y", "double", "0", "0", "360"));
- paramList.append(quickParameterFill(ret, i18n("Fix Shear X"), "fix_shear_x", "double", "0", "0", "360"));
- paramList.append(quickParameterFill(ret, i18n("Fix Shear Z"), "fix_shear_z", "double", "0", "0", "360"));
+ paramList.append(quickParameterFill(ret, i18n("Fix Shear Y"), "shear_y", "double", "0", "0", "360"));
+ paramList.append(quickParameterFill(ret, i18n("Fix Shear X"), "shear_x", "double", "0", "0", "360"));
+ paramList.append(quickParameterFill(ret, i18n("Fix Shear Z"), "shear_z", "double", "0", "0", "360"));
} else if (name == "mix") {
tname.appendChild(ret.createTextNode(i18n("Mix")));
} else if (name == "region") {