}
//static
-Mlt::Repository *initEffects::parseEffectFiles()
+void initEffects::parseEffectFiles()
{
QStringList::Iterator more;
QStringList::Iterator it;
Mlt::Repository *repository = Mlt::Factory::init();
if (!repository) {
kDebug() << "Repository didn't finish initialisation" ;
- return NULL;
+ return;
}
// Retrieve the list of MLT's available effects.
Mlt::Properties *filters = repository->filters();
QStringList filtersList;
- for (int i = 0; i < filters->count(); ++i)
+ int max = filters->count();
+ for (int i = 0; i < max; ++i)
filtersList << filters->get_name(i);
delete filters;
// Retrieve the list of available producers.
Mlt::Properties *producers = repository->producers();
QStringList producersList;
- for (int i = 0; i < producers->count(); ++i)
+ max = producers->count();
+ for (int i = 0; i < max; ++i)
producersList << producers->get_name(i);
KdenliveSettings::setProducerslist(producersList);
delete producers;
// Retrieve the list of available transitions.
Mlt::Properties *transitions = repository->transitions();
QStringList transitionsItemList;
- for (int i = 0; i < transitions->count(); ++i)
+ max = transitions->count();
+ for (int i = 0; i < max; ++i)
transitionsItemList << transitions->get_name(i);
delete transitions;
QMap<QString, QDomElement> audioEffectsMap;
// Create transitions
- for (int i = 0; i < MainWindow::transitions.count(); ++i) {
+ max = MainWindow::transitions.count();
+ for (int i = 0; i < max; ++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)
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());
}
}
}
// Create custom effects
- for (int i = 0; i < MainWindow::customEffects.count(); ++i) {
+ max = MainWindow::customEffects.count();
+ for (int i = 0; i < max; ++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)
effectsMap.clear();
// Create audio effects
- for (int i = 0; i < MainWindow::audioEffects.count(); ++i) {
+ max = MainWindow::audioEffects.count();
+ for (int i = 0; i < max; ++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)
MainWindow::audioEffects.append(effect);
// Create video effects
- for (int i = 0; i < MainWindow::videoEffects.count(); ++i) {
+ max = MainWindow::videoEffects.count();
+ for (int i = 0; i < max; ++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)
MainWindow::videoEffects.append(effect);
-
- return repository;
}
// static
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)
- MainWindow::customEffects.append(effect);
+ MainWindow::customEffects.append(effect);
}
// static
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")) {
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)
}
}
+ 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());
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() + "<br />";
-
- QString effectAuthor;
- QDomNode authnode = documentElement.elementsByTagName("author").item(0);
- if (!authnode.isNull()) effectAuthor = authnode.toElement().text() + "<br />";
-
- 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);
- }*/
}
}
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");
QDomElement desc = ret.createElement("description");
ktrans.appendChild(tname);
ktrans.appendChild(desc);
- Mlt::Properties *metadata = repository->metadata(transition_type, name.toUtf8().data());
- if (!customTransitions.contains(name) && metadata && metadata->is_valid()) {
+ Mlt::Properties *metadata = NULL;
+ if (!customTransitions.contains(name)) metadata = repository->metadata(transition_type, name.toUtf8().data());
+ if (metadata && metadata->is_valid()) {
// If possible, set name and description.
if (metadata->get("title") && metadata->get("identifier"))
tname.appendChild(ret.createTextNode(metadata->get("title")));
params.appendChild(pname);
ktrans.appendChild(params);
}
- delete metadata;
- metadata = 0;
} else {
/*
* Check for Kdenlive installed luma files, add empty string at
paramList.append(quickParameterFill(ret, "keyed", "keyed", "fixed", "1", "1", "1"));
paramList.append(quickParameterFill(ret, i18n("Geometry"), "geometry", "geometry", "0/0:100%x100%:100%", "0/0:100%x100%:100%", "0/0:100%x100%:100%", "", "", "", "", "", "true"));
-
+ paramList.append(quickParameterFill(ret, i18n("Distort"), "distort", "bool", "0", "0", "1"));
paramList.append(quickParameterFill(ret, i18n("Rotate X"), "rotate_x", "addedgeometry", "0", "-1800", "1800", QString(), QString(), "10"));
paramList.append(quickParameterFill(ret, i18n("Rotate Y"), "rotate_y", "addedgeometry", "0", "-1800", "1800", QString(), QString(), "10"));
paramList.append(quickParameterFill(ret, i18n("Rotate Z"), "rotate_z", "addedgeometry", "0", "-1800", "1800", QString(), QString(), "10"));
/*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") {
foreach(const QDomElement & e, paramList)
ktrans.appendChild(e);
}
-
+ delete metadata;
+ metadata = 0;
// Add the transition to the global list.
transitions->append(ret.documentElement());
//kDebug() << ret.toString();
projects / kdenlive / blobdiff