X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finiteffects.cpp;h=395a1f76dd368f59d1909c69853b05c01cee284a;hb=a7fe0606ce9ccd258dbeb08086bdc4c013c9e73e;hp=1fec379f6840e447b539f81632734c55e02c7049;hpb=833cf1051c3e0ace17ec9994cb929d6784bfe815;p=kdenlive diff --git a/src/initeffects.cpp b/src/initeffects.cpp index 1fec379f..395a1f76 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; @@ -92,11 +133,27 @@ Mlt::Repository *initEffects::parseEffectFiles() { if (file.open(QIODevice::ReadOnly)) { QTextStream in(&file); while (!in.atEnd()) { - blackListed.append(in.readLine().simplified()); + 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); } @@ -117,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"); @@ -163,7 +224,7 @@ void initEffects::parseCustomEffectsFile() { filter << "*.xml"; const QStringList fileList = directory.entryList(filter, QDir::Files); QString itemName; - foreach(const QString filename, fileList) { + foreach(const QString &filename, fileList) { itemName = KUrl(path + filename).path(); QDomDocument doc; QFile file(itemName); @@ -194,24 +255,23 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *au } QString groupName; if (doc.elementsByTagName("effectgroup").item(0).toElement().tagName() == "effectgroup") { - groupName = documentElement.attribute("name", QString::null); + groupName = documentElement.attribute("name", QString()); } int i = 0; while (!effects.item(i).isNull()) { documentElement = effects.item(i).toElement(); - QString tag = documentElement.attribute("tag", QString::null); + QString tag = documentElement.attribute("tag", QString()); bool ladspaOk = true; if (tag == "ladspa") { - QString library = documentElement.attribute("library", QString::null); + QString library = documentElement.attribute("library", QString()); if (KStandardDirs::locate("ladspa_plugin", library).isEmpty()) ladspaOk = false; } // Parse effect file if ((filtersList.contains(tag) || producersList.contains(tag)) && ladspaOk) { - bool isAudioEffect = false; - QString type = documentElement.attribute("type", QString::null); + QString type = documentElement.attribute("type", QString()); if (type == "audio") audioEffectList->append(documentElement); else if (type == "custom") customEffectList->append(documentElement); else videoEffectList->append(documentElement); @@ -235,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; } @@ -291,7 +351,7 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *au } //static -char* initEffects::ladspaEffectString(int ladspaId, QStringList params) { +const char* initEffects::ladspaEffectString(int ladspaId, QStringList params) { if (ladspaId == 1433) //Pitch return ladspaPitchEffectString(params); else if (ladspaId == 1216) //Room Reverb @@ -302,13 +362,13 @@ char* initEffects::ladspaEffectString(int ladspaId, QStringList params) { return ladspaEqualizerEffectString(params); else { kDebug() << "++++++++++ ASKING FOR UNKNOWN LADSPA EFFECT: " << ladspaId << endl; - return (char *) ""; + return ""; } } //static void initEffects::ladspaEffectFile(const QString & fname, int ladspaId, QStringList params) { - char *filterString; + const char *filterString; switch (ladspaId) { case 1433: //Pitch filterString = ladspaPitchEffectString(params); @@ -355,57 +415,57 @@ void initEffects::ladspaEffectFile(const QString & fname, int ladspaId, QStringL delete filterString; } -QString jackString = "248000"; +const QString jackString = "248000"; -char* initEffects::ladspaDeclipEffectString(QStringList) { +const char* initEffects::ladspaDeclipEffectString(QStringList) { return qstrdup(QString(jackString + "1195truefalsetrue1.0000001.000000true").toUtf8()); } /* -char* initEffects::ladspaVocoderEffectString(QStringList params) +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])); }*/ -char* initEffects::ladspaVinylEffectString(QStringList params) { +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()); } -char* initEffects::ladspaPitchEffectString(QStringList params) { +const char* initEffects::ladspaPitchEffectString(QStringList params) { return qstrdup(QString(jackString + "1433truefalsetrue1.01.0truetrue%1%1true4.0000004.000000").arg(params[0]).toUtf8()); } -char* initEffects::ladspaRoomReverbEffectString(QStringList params) { +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()); } -char* initEffects::ladspaReverbEffectString(QStringList params) { +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()); } -char* initEffects::ladspaEqualizerEffectString(QStringList params) { +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()); } -char* initEffects::ladspaLimiterEffectString(QStringList params) { +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()); } -char* initEffects::ladspaPitchShifterEffectString(QStringList params) { +const char* initEffects::ladspaPitchShifterEffectString(QStringList params) { return qstrdup(QString(jackString + "1193truefalsetrue1.0000001.000000truetrue%1%1").arg(params[0]).toUtf8()); } -char* initEffects::ladspaRateScalerEffectString(QStringList params) { +const char* initEffects::ladspaRateScalerEffectString(QStringList params) { return qstrdup(QString(jackString + "1417truefalsetrue1.0000001.000000truetrue%1%1").arg(params[0]).toUtf8()); } -char* initEffects::ladspaPhaserEffectString(QStringList params) { +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()); } -QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, const QString& type, const QString& filtername) { +QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, const QString& /*type*/, const QString& filtername) { QDomDocument ret; Mlt::Properties *metadata = repository->metadata(filter_type, filtername.toAscii().data()); @@ -491,12 +551,19 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList* 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"); @@ -546,39 +613,52 @@ 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") { + 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")); + paramList.append(quickParameterFill(ret, "Distort", "distort", "bool", "0", "0", "1")); + paramList.append(quickParameterFill(ret, "Align", "aligned", "bool", "1", "0", "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")); @@ -608,6 +688,7 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList* } ktrans.appendChild(tname); + ktrans.appendChild(desc); foreach(const QDomElement &e, paramList) { ktrans.appendChild(e); @@ -616,17 +697,22 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList* transitions->append(ret.documentElement()); //kDebug() << "//// //// TRANSITON XML"; - //kDebug() << ret.toString(); + // 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) {