#include <KStandardDirs>
#include <QFile>
-#include <qregexp.h>
+#include <QRegExp>
#include <QDir>
#include <QIcon>
}
QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", "luma");
QDomNodeList params = lumaTransition.elementsByTagName("parameter");
- for (int i = 0; i < params.count(); i++) {
+ for (int i = 0; i < params.count(); ++i) {
QDomElement e = params.item(i).toElement();
if (e.attribute("tag") == "resource") {
e.setAttribute("paramlistdisplay", imagenamelist.join(","));
QDomElement compositeTransition = MainWindow::transitions.getEffectByTag("composite", "composite");
params = compositeTransition.elementsByTagName("parameter");
- for (int i = 0; i < params.count(); i++) {
+ for (int i = 0; i < params.count(); ++i) {
QDomElement e = params.item(i).toElement();
if (e.attribute("tag") == "luma") {
e.setAttribute("paramlistdisplay", imagenamelist.join(","));
}
// static
-QDomDocument initEffects::getUsedCustomEffects(QMap <QString, QString> effectids)
+QDomDocument initEffects::getUsedCustomEffects(const QMap <QString, QString>& effectids)
{
QMapIterator<QString, QString> i(effectids);
int ix;
while (!in.atEnd()) {
QString black = in.readLine().simplified();
if (!black.isEmpty() && !black.startsWith('#') &&
- mltFiltersList.contains(black))
+ mltFiltersList.contains(black)) {
mltFiltersList.removeAll(black);
+ }
+
}
file2.close();
}
MainWindow::transitions.clearList();
foreach(const QDomElement & effect, effectsMap)
MainWindow::transitions.append(effect);
- effectsMap.clear();
-
+ effectsMap.clear();
// Create effects from MLT
foreach(const QString & filtername, mltFiltersList) {
QDomDocument doc = createDescriptionFromMlt(repository, "filters", filtername);
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().firstChildElement("name").text().toLower().toUtf8().data(), doc.documentElement());
+ else {
+ audioEffectsMap.insert(doc.documentElement().firstChildElement("name").text().toLower().toUtf8().data(), doc.documentElement());
+ }
}
}
else
}
// static
-void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *audioEffectList, EffectsList *videoEffectList, QString name, QStringList filtersList, QStringList producersList, Mlt::Repository *repository)
+void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *audioEffectList, EffectsList *videoEffectList, const QString &name, QStringList filtersList, QStringList producersList, Mlt::Repository *repository)
{
QDomDocument doc;
QFile file(name);
for (int j = 0; j < params.count(); j++) {
QDomNamedNodeMap attrs = params.at(j).attributes();
for (int k = 0; k < attrs.count(); k++) {
- QString name = attrs.item(k).nodeName();
- if (name != "type" && name != "name") {
+ QString nodeName = attrs.item(k).nodeName();
+ if (nodeName != "type" && nodeName != "name") {
QString val = attrs.item(k).nodeValue();
if (val.contains(oldSeparator)) {
QString newVal = val.replace(oldSeparator, separator);
Mlt::Properties tags((mlt_properties) metadata->get_data("tags"));
if (QString(tags.get(0)) == "Audio") eff.setAttribute("type", "audio");
- /*for (int i = 0; i < tags.count(); i++)
+ /*for (int i = 0; i < tags.count(); ++i)
kDebug()<<tags.get_name(i)<<"="<<tags.get(i);*/
Mlt::Properties param_props((mlt_properties) metadata->get_data("parameters"));
QDomElement params = ret.createElement("parameter");
Mlt::Properties paramdesc((mlt_properties) param_props.get_data(param_props.get_name(j)));
-
params.setAttribute("name", paramdesc.get("identifier"));
+ if (params.attribute("name") == "argument") {
+ // This parameter has to be given as attribute when using command line, do not show it in Kdenlive
+ continue;
+ }
if (paramdesc.get("maximum")) params.setAttribute("max", paramdesc.get("maximum"));
if (paramdesc.get("minimum")) params.setAttribute("min", paramdesc.get("minimum"));
QString paramType = paramdesc.get("type");
- if (paramType == "integer")
- params.setAttribute("type", "constant");
+ if (paramType == "integer") {
+ if (params.attribute("min") == "0" && params.attribute("max") == "1")
+ params.setAttribute("type", "bool");
+ else params.setAttribute("type", "constant");
+
+ }
else if (paramType == "float") {
params.setAttribute("type", "constant");
// param type is float, set default decimals to 3
QDomElement pname = ret.createElement("name");
pname.appendChild(ret.createTextNode(paramdesc.get("title")));
params.appendChild(pname);
+
+ if (paramdesc.get("description")) {
+ QDomElement desc = ret.createElement("comment");
+ desc.appendChild(ret.createTextNode(paramdesc.get("description")));
+ params.appendChild(desc);
+ }
eff.appendChild(params);
}
transitions->append(ret.documentElement());*/
}
-QDomElement initEffects::quickParameterFill(QDomDocument & doc, QString name, QString tag, QString type, QString def, QString min, QString max, QString list, QString listdisplaynames, QString factor, QString namedesc, QString format, QString opacity)
+QDomElement initEffects::quickParameterFill(QDomDocument & doc, const QString &name, const QString &tag, const QString &type, const QString &def, const QString &min, const QString &max, const QString &list, const QString &listdisplaynames, const QString &factor, const QString &namedesc, const QString &format, const QString &opacity)
{
QDomElement parameter = doc.createElement("parameter");
parameter.setAttribute("tag", tag);
return parameter;
}
+
+#include "initeffects.moc"