#include "initeffects.h"
#include "kdenlivesettings.h"
#include "effectslist.h"
-#include "effectstackedit.h"
#include "mainwindow.h"
#include <KDebug>
#include <QDir>
#include <QIcon>
+#include "locale.h"
+
initEffectsThumbnailer::initEffectsThumbnailer() :
QThread()
{
foreach(const QString & entry, m_list) {
kDebug() << entry;
if (!entry.isEmpty() && (entry.endsWith(".png") || entry.endsWith(".pgm"))) {
- if (!EffectStackEdit::iconCache.contains(entry)) {
+ if (!MainWindow::m_lumacache.contains(entry)) {
QImage pix(entry);
//if (!pix.isNull())
- EffectStackEdit::iconCache[entry] = pix.scaled(30, 30);
+ MainWindow::m_lumacache.insert(entry, pix.scaled(30, 30, Qt::KeepAspectRatio, Qt::SmoothTransformation));
kDebug() << "stored";
}
}
}
//static
-void initEffects::parseEffectFiles()
+void initEffects::parseEffectFiles(const QString &locale)
{
QStringList::Iterator more;
QStringList::Iterator it;
return;
}
+ // Warning: Mlt::Factory::init() resets the locale to the default system value, make sure we keep correct locale
+ if (!locale.isEmpty()) setlocale(LC_NUMERIC, locale.toUtf8().constData());
+
// Retrieve the list of MLT's available effects.
Mlt::Properties *filters = repository->filters();
QStringList filtersList;
max = MainWindow::customEffects.count();
for (int i = 0; i < max; ++i) {
effectInfo = MainWindow::customEffects.at(i);
- effectsMap.insert(effectInfo.firstChildElement("name").text().toLower().toUtf8().data(), effectInfo);
+ if (effectInfo.tagName() == "effectgroup") {
+ effectsMap.insert(effectInfo.attribute("name").toUtf8().data(), effectInfo);
+ }
+ else effectsMap.insert(effectInfo.firstChildElement("name").text().toUtf8().data(), effectInfo);
}
MainWindow::customEffects.clearList();
foreach(const QDomElement & effect, effectsMap)
QDomDocument doc;
QDomNodeList effects;
QDomElement e;
+ int unknownGroupCount = 0;
foreach(const QString & filename, fileList) {
QString itemName = KUrl(path + filename).path();
QFile file(itemName);
doc.setContent(&file, false);
file.close();
- effects = doc.elementsByTagName("effect");
- if (effects.count() != 1) {
- kDebug() << "More than one effect in file " << itemName << ", not supported yet";
- } else {
- e = effects.item(0).toElement();
- effectsMap.insert(e.firstChildElement("name").text().toLower().toUtf8().data(), e);
+ QDomElement base = doc.documentElement();
+ if (base.tagName() == "effectgroup") {
+ QString groupName = base.attribute("name");
+ if (groupName.isEmpty()) {
+ groupName = i18n("Group %1", unknownGroupCount);
+ base.setAttribute("name", groupName);
+ unknownGroupCount++;
+ }
+ effectsMap.insert(groupName.toLower().toUtf8().data(), base);
+ } else if (base.tagName() == "effect") {
+ effectsMap.insert(base.firstChildElement("name").text().toLower().toUtf8().data(), base);
}
+ else kDebug() << "Unsupported effect file: " << itemName;
}
foreach(const QDomElement & effect, effectsMap)
MainWindow::customEffects.append(effect);
doc.setContent(&file, false);
file.close();
QDomElement documentElement;
- QDomNodeList effects = doc.elementsByTagName("effect");
+ QDomNodeList effects;
+ QDomElement base = doc.documentElement();
+ effects = doc.elementsByTagName("effect");
if (effects.count() == 0) {
kDebug() << "Effect broken: " << name;
}
// Parse effect information.
- if ((filtersList.contains(tag) || producersList.contains(tag))) {
+ if (base.tagName() != "effectgroup" && (filtersList.contains(tag) || producersList.contains(tag))) {
QString type = documentElement.attribute("type", QString());
if (type == "audio")
audioEffectList->append(documentElement);
videoEffectList->append(documentElement);
}
}
+ if (base.tagName() == "effectgroup") {
+ QString type = base.attribute("type", QString());
+ if (type == "audio")
+ audioEffectList->append(base);
+ else if (type == "custom")
+ customEffectList->append(base);
+ else
+ videoEffectList->append(base);
+ }
}
QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, const QString& /*type*/, const QString& filtername)
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"));