X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finiteffects.cpp;h=12174d8d1a2806a204233f746246f97079f87f6c;hb=b0c4f76122be35f6a9834f7988f2025e0bbece5a;hp=d4cb8810c1c2725d090dc621490b7574e149307f;hpb=dafaf7597142fc94422fa465120ba2dee34e7c8e;p=kdenlive diff --git a/src/initeffects.cpp b/src/initeffects.cpp index d4cb8810..12174d8d 100644 --- a/src/initeffects.cpp +++ b/src/initeffects.cpp @@ -17,22 +17,21 @@ * * ***************************************************************************/ - -#include -#include -#include -#include - -#include -#include -#include - #include "initeffects.h" #include "kdenlivesettings.h" #include "effectslist.h" #include "effectstackedit.h" #include "mainwindow.h" +#include +#include +#include + +#include +#include +#include +#include + initEffectsThumbnailer::initEffectsThumbnailer() { } @@ -66,6 +65,48 @@ initEffects::initEffects() { initEffects::~initEffects() { } + +// static +void initEffects::refreshLumas() { + + // Check for Kdenlive installed luma files + QStringList imagenamelist; + QStringList imagefiles; + QStringList filters; + filters << "*.pgm" << "*.png"; + + QStringList customLumas = KGlobal::dirs()->findDirs("appdata", "lumas"); + foreach(const QString &folder, customLumas) { + QStringList filesnames = QDir(folder).entryList(filters, QDir::Files); + foreach(const QString &fname, filesnames) { + imagenamelist.append(fname); + imagefiles.append(folder + '/' + fname); + } + } + + // Check for MLT lumas + QString folder = mlt_environment("MLT_DATA"); + folder.append("/lumas/").append(mlt_environment("MLT_NORMALISATION")); + QDir lumafolder(folder); + QStringList filesnames = lumafolder.entryList(filters, QDir::Files); + foreach(const QString &fname, filesnames) { + imagenamelist.append(fname); + imagefiles.append(folder + '/' + fname); + } + QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", QString()); + QDomNodeList params = lumaTransition.elementsByTagName("parameter"); + for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + if (e.attribute("tag") == "resource") { + e.setAttribute("paramlistdisplay", imagenamelist.join(",")); + e.setAttribute("paramlist", imagefiles.join(",")); + break; + } + } + + +} + //static Mlt::Repository *initEffects::parseEffectFiles() { QStringList::Iterator more; @@ -83,6 +124,36 @@ Mlt::Repository *initEffects::parseEffectFiles() { Mlt::Properties *filters = repository->filters(); QStringList filtersList; + // Check for blacklisted effects + QString blacklist = KStandardDirs::locate("appdata", "blacklisted_effects.txt"); + + QFile file(blacklist); + QStringList blackListed; + + if (file.open(QIODevice::ReadOnly)) { + QTextStream in(&file); + while (!in.atEnd()) { + QString black = in.readLine().simplified(); + if (!black.isEmpty() && !black.startsWith('#')) blackListed.append(black); + } + } + file.close(); + + // Check for blacklisted transitions + blacklist = KStandardDirs::locate("appdata", "blacklisted_transitions.txt"); + + QFile file2(blacklist); + QStringList blackListedtransitions; + + if (file2.open(QIODevice::ReadOnly)) { + QTextStream in(&file2); + while (!in.atEnd()) { + QString black = in.readLine().simplified(); + if (!black.isEmpty() && !black.startsWith('#')) blackListedtransitions.append(black); + } + } + file2.close(); + for (int i = 0 ; i < filters->count() ; i++) { filtersList << filters->get_name(i); } @@ -103,6 +174,10 @@ Mlt::Repository *initEffects::parseEffectFiles() { transitionsItemList << transitions->get_name(i); } delete transitions; + + foreach(const QString &trans, blackListedtransitions) { + if (transitionsItemList.contains(trans)) transitionsItemList.removeAll(trans); + } fillTransitionsList(repository, &MainWindow::transitions, transitionsItemList); KGlobal::dirs()->addResourceType("ladspa_plugin", 0, "lib/ladspa"); @@ -127,6 +202,11 @@ Mlt::Repository *initEffects::parseEffectFiles() { // kDebug()<<"// FOUND EFFECT FILE: "<append(documentElement); - else if (type == "custom") customEffectList->append(documentElement); - else videoEffectList->append(documentElement); - } else videoEffectList->append(documentElement); + QString type = documentElement.attribute("type", QString()); + if (type == "audio") audioEffectList->append(documentElement); + else if (type == "custom") customEffectList->append(documentElement); + else videoEffectList->append(documentElement); } /* @@ -220,10 +295,10 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *au QDomNode propsnode = documentElement.elementsByTagName("properties").item(0); if (!propsnode.isNull()) { QDomElement propselement = propsnode.toElement(); - id = propselement.attribute("id", QString::null); - effectTag = propselement.attribute("tag", QString::null); - if (propselement.attribute("type", QString::null) == "audio") type = AUDIOEFFECT; - else if (propselement.attribute("type", QString::null) == "custom") type = CUSTOMEFFECT; + 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; } @@ -340,7 +415,7 @@ void initEffects::ladspaEffectFile(const QString & fname, int ladspaId, QStringL delete filterString; } -QString jackString = "248000"; +const QString jackString = "248000"; char* initEffects::ladspaDeclipEffectString(QStringList) { @@ -399,6 +474,7 @@ QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, if (metadata->get("title") && metadata->get("identifier")) { QDomElement eff = ret.createElement("effect"); eff.setAttribute("tag", metadata->get("identifier")); + eff.setAttribute("id", metadata->get("identifier")); QDomElement name = ret.createElement("name"); name.appendChild(ret.createTextNode(metadata->get("title"))); @@ -409,13 +485,9 @@ QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, QDomElement author = ret.createElement("author"); author.appendChild(ret.createTextNode(metadata->get("creator"))); - QDomElement prop = ret.createElement("properties"); - prop.setAttribute("id", metadata->get("identifier")); - prop.setAttribute("tag", metadata->get("identifier")); eff.appendChild(name); eff.appendChild(author); eff.appendChild(desc); - eff.appendChild(prop); Mlt::Properties param_props((mlt_properties) metadata->get_data("parameters")); for (int j = 0; param_props.is_valid() && j < param_props.count();j++) { @@ -429,10 +501,16 @@ QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, if (paramdesc.get("minimum")) params.setAttribute("min", paramdesc.get("minimum")); if (QString(paramdesc.get("type")) == "integer") params.setAttribute("type", "constant"); + if (QString(paramdesc.get("type")) == "float") { + params.setAttribute("type", "constant"); + params.setAttribute("factor", "1000"); + if (paramdesc.get("maximum")) params.setAttribute("max", QString(paramdesc.get("maximum")).toFloat()*1000.0); + if (paramdesc.get("minimum")) params.setAttribute("min", QString(paramdesc.get("minimum")).toFloat()*1000.0); + } if (QString(paramdesc.get("type")) == "boolean") params.setAttribute("type", "bool"); if (!QString(paramdesc.get("format")).isEmpty() && QString(paramdesc.get("type")) != "geometry") { - params.setAttribute("type", "complex"); + params.setAttribute("type", "geometry"); params.setAttribute("format", paramdesc.get("format")); } if (!QString(paramdesc.get("format")).isEmpty() && QString(paramdesc.get("type")) == "geometry") { @@ -464,16 +542,28 @@ QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, } void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList* transitions, QStringList names) { + // remove transitions that are not implemented + int pos = names.indexOf("mix"); + if (pos != -1) names.takeAt(pos); + pos = names.indexOf("region"); + if (pos != -1) names.takeAt(pos); foreach(const QString &name, names) { QDomDocument ret; QDomElement ktrans = ret.createElement("ktransition"); ret.appendChild(ktrans); + ktrans.setAttribute("tag", name); QDomElement tname = ret.createElement("name"); + + QDomElement desc = ret.createElement("description"); + QList paramList; Mlt::Properties *metadata = repository->metadata(transition_type, name.toAscii().data()); //kDebug() << filtername; if (metadata && metadata->is_valid()) { + + desc.appendChild(ret.createTextNode(metadata->get("description"))); + Mlt::Properties param_props((mlt_properties) metadata->get_data("parameters")); for (int j = 0; param_props.is_valid() && j < param_props.count();j++) { QDomElement params = ret.createElement("parameter"); @@ -523,38 +613,51 @@ 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")); + + // Check for Kdenlive installed luma files + QStringList imagenamelist; + QStringList imagefiles; + QStringList filters; + filters << "*.pgm" << "*.png"; + + QStringList customLumas = KGlobal::dirs()->findDirs("appdata", "lumas"); + foreach(const QString &folder, customLumas) { + QStringList filesnames = QDir(folder).entryList(filters, QDir::Files); + foreach(const QString &fname, filesnames) { + imagenamelist.append(fname); + imagefiles.append(folder + '/' + fname); + } + } - QString path(mlt_environment("MLT_DATA")); - path.append("/lumas/").append(mlt_environment("MLT_NORMALISATION")); - Mlt::Properties entries; - mlt_properties_dir_list(entries.get_properties(), path.toAscii().data(), "*.*", 1); - kDebug() << path << entries.count(); - QString imagefiles; - //QStringList imagelist; - QString imagenamelist; - for (int i = 0;i < entries.count();i++) { - //if (!imagefiles.isEmpty()) // add empty entry too - imagefiles.append(","); - imagefiles.append(entries.get(i)); - //imagelist << entries.get(i); - imagenamelist.append(","); - imagenamelist.append(KUrl(entries.get(i)).fileName()); + // Check for MLT lumas + QString folder = mlt_environment("MLT_DATA"); + folder.append("/lumas/").append(mlt_environment("MLT_NORMALISATION")); + QDir lumafolder(folder); + QStringList filesnames = lumafolder.entryList(filters, QDir::Files); + foreach(const QString &fname, filesnames) { + imagenamelist.append(fname); + imagefiles.append(folder + '/' + fname); } + paramList.append(quickParameterFill(ret, "Softness", "softness", "double", "0", "0", "100", "", "", "100")); paramList.append(quickParameterFill(ret, "Invert", "invert", "bool", "0", "0", "1")); - paramList.append(quickParameterFill(ret, "ImageFile", "resource", "list", "", "", "", imagefiles, imagenamelist)); + paramList.append(quickParameterFill(ret, "ImageFile", "resource", "list", "", "", "", imagefiles.join(","), imagenamelist.join(","))); + paramList.append(quickParameterFill(ret, "Reverse Transition", "reverse", "bool", "0", "0", "1")); //thumbnailer.prepareThumbnailsCall(imagelist); } else if (name == "composite") { - paramList.append(quickParameterFill(ret, "Geometry", "geometry", "geometry", "0;0;100;100;100", "-500;-500;-500;-500;0", "500;500;500;500;100")); + desc.appendChild(ret.createTextNode("A key-framable alpha-channel compositor for two frames.")); + paramList.append(quickParameterFill(ret, "Geometry", "geometry", "geometry", "0%,0%:100%x100%:100", "-500;-500;-500;-500;0", "500;500;500;500;100")); + paramList.append(quickParameterFill(ret, "Distort", "distort", "bool", "1", "1", "1")); tname.appendChild(ret.createTextNode("Composite")); - - QDomDocument ret1; + ktrans.setAttribute("id", "composite"); + /*QDomDocument ret1; QDomElement ktrans1 = ret1.createElement("ktransition"); ret1.appendChild(ktrans1); ktrans1.setAttribute("tag", name); QDomElement tname1 = ret.createElement("name"); - tname1.appendChild(ret1.createTextNode("PIP")); + tname1.appendChild(ret1.createTextNode("PIP"));*/ } else if (name == "mix") { tname.appendChild(ret.createTextNode("Mix")); @@ -582,8 +685,9 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList* } - paramList.append(quickParameterFill(ret, "Reverse Transition", "reverse", "bool", "0", "0", "1")); + ktrans.appendChild(tname); + ktrans.appendChild(desc); foreach(const QDomElement &e, paramList) { ktrans.appendChild(e); @@ -591,18 +695,23 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList* transitions->append(ret.documentElement()); - kDebug() << "//// //// TRANSITON XML"; - kDebug() << ret.toString(); + //kDebug() << "//// //// TRANSITON XML"; + // kDebug() << ret.toString(); /* */ } - QString wipetrans = "WipeDirection Align"; + QString wipetrans = "WipeSlide image from one side to anotherDirection Align"; QDomDocument ret; ret.setContent(wipetrans); transitions->append(ret.documentElement()); + + QString alphatrans = "Alpha transparencyMake alpha channel transparentDirectionRescaleAlign"; + QDomDocument ret2; + ret2.setContent(alphatrans); + transitions->append(ret2.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) {