]> git.sesse.net Git - kdenlive/blobdiff - src/initeffects.cpp
Fix LADSPA effects, should work now:
[kdenlive] / src / initeffects.cpp
index ffb9be64fbd49d1e12ccc108a97538bcd09c33d8..5d6ee274ce571e0ac03e4a0478f6d5ef69efaaa0 100644 (file)
@@ -66,6 +66,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 +125,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 +175,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");
@@ -118,13 +194,20 @@ Mlt::Repository *initEffects::parseEffectFiles() {
     QDir directory;
     for (more = direc.begin() ; more != direc.end() ; ++more) {
         directory = QDir(*more);
-        fileList = directory.entryList(QDir::Files);
+        QStringList filter;
+        filter << "*.xml";
+        fileList = directory.entryList(filter, QDir::Files);
         for (it = fileList.begin() ; it != fileList.end() ; ++it) {
             itemName = KUrl(*more + *it).path();
-            parseEffectFile(&MainWindow::audioEffects, &MainWindow::videoEffects, itemName, filtersList, producersList);
+            parseEffectFile(&MainWindow::customEffects, &MainWindow::audioEffects, &MainWindow::videoEffects, itemName, filtersList, producersList);
             // kDebug()<<"//  FOUND EFFECT FILE: "<<itemName<<endl;
         }
     }
+
+    foreach(const QString &effect, blackListed) {
+        if (filtersList.contains(effect)) filtersList.removeAll(effect);
+    }
+
     foreach(const QString &filtername, filtersList) {
         QDomDocument doc = createDescriptionFromMlt(repository, "filters", filtername);
         if (!doc.isNull())
@@ -134,10 +217,36 @@ Mlt::Repository *initEffects::parseEffectFiles() {
 }
 
 // static
-void initEffects::parseEffectFile(EffectsList *audioEffectList, EffectsList *videoEffectList, QString name, QStringList filtersList, QStringList producersList) {
+void initEffects::parseCustomEffectsFile() {
+    MainWindow::customEffects.clear();
+    QString path = KStandardDirs::locateLocal("appdata", "effects/", true);
+    QDir directory = QDir(path);
+    QStringList filter;
+    filter << "*.xml";
+    const QStringList fileList = directory.entryList(filter, QDir::Files);
+    QString itemName;
+    foreach(const QString filename, fileList) {
+        itemName = KUrl(path + filename).path();
+        QDomDocument doc;
+        QFile file(itemName);
+        doc.setContent(&file, false);
+        file.close();
+        QDomNodeList effects = doc.elementsByTagName("effect");
+        if (effects.count() != 1) {
+            kDebug() << "More than one effect in file " << itemName << ", NOT SUPPORTED YET";
+        } else {
+            QDomElement e = effects.item(0).toElement();
+            MainWindow::customEffects.append(e);
+        }
+    }
+}
+
+// static
+void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *audioEffectList, EffectsList *videoEffectList, QString name, QStringList filtersList, QStringList producersList) {
     QDomDocument doc;
     QFile file(name);
     doc.setContent(&file, false);
+    file.close();
     QDomElement documentElement = doc.documentElement();
     QDomNodeList effects = doc.elementsByTagName("effect");
 
@@ -164,16 +273,9 @@ void initEffects::parseEffectFile(EffectsList *audioEffectList, EffectsList *vid
         // Parse effect file
         if ((filtersList.contains(tag) || producersList.contains(tag)) && ladspaOk) {
             bool isAudioEffect = false;
-            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") isAudioEffect = true;
-                //else if (propselement.attribute("type", QString::null) == "custom") type = CUSTOMEFFECT;
-                //else type = VIDEOEFFECT;
-            }
-            if (isAudioEffect) audioEffectList->append(documentElement);
+            QString type = documentElement.attribute("type", QString::null);
+            if (type == "audio") audioEffectList->append(documentElement);
+            else if (type == "custom") customEffectList->append(documentElement);
             else videoEffectList->append(documentElement);
         }
 
@@ -315,7 +417,7 @@ void initEffects::ladspaEffectFile(const QString & fname, int ladspaId, QStringL
     delete filterString;
 }
 
-QString jackString = "<?xml version=\"1.0\"?><!DOCTYPE jackrack SYSTEM \"http://purge.bash.sh/~rah/jack_rack_1.2.dtd\"><jackrack><channels>2</channels><samplerate>48000</samplerate><plugin><id>";
+const QString jackString = "<?xml version=\"1.0\"?><!DOCTYPE jackrack SYSTEM \"http://purge.bash.sh/~rah/jack_rack_1.2.dtd\"><jackrack><channels>2</channels><samplerate>48000</samplerate><plugin><id>";
 
 
 char* initEffects::ladspaDeclipEffectString(QStringList) {
@@ -374,6 +476,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")));
@@ -384,13 +487,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++) {
@@ -404,10 +503,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") {
@@ -439,16 +544,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<QDomElement> 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");
@@ -495,34 +612,47 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
 
             //kDebug() << ret.toString();
         } else {
-
-
             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;
-                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);
+                // 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, "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));
+                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", "0;0;100;100;100", "0;0;100;100;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;
                 QDomElement ktrans1 = ret1.createElement("ktransition");
                 ret1.appendChild(ktrans1);
@@ -556,8 +686,9 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
 
 
         }
-        paramList.append(quickParameterFill(ret, "Reverse Transition", "reverse", "bool", "1", "0", "1"));
+
         ktrans.appendChild(tname);
+        ktrans.appendChild(desc);
 
         foreach(const QDomElement &e, paramList) {
             ktrans.appendChild(e);
@@ -565,13 +696,26 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
 
 
         transitions->append(ret.documentElement());
+        //kDebug() << "//// ////  TRANSITON XML";
+        kDebug() << ret.toString();
         /*
 
          <transition fill="1" in="11" a_track="1" out="73" mlt_service="luma" b_track="2" softness="0" resource="/home/marco/Projekte/kdenlive/install_cmake/share/apps/kdenlive/pgm/PAL/square2.pgm" />
         */
     }
+
+    QString wipetrans = "<ktransition tag=\"composite\" id=\"wipe\"><name>Wipe</name><description>Slide image from one side to another</description><parameter tag=\"geometry\" type=\"wipe\" default=\"-100%,0%:100%x100%;-1=0%,0%:100%x100%\" name=\"geometry\"><name>Direction</name>                                               </parameter><parameter tag=\"aligned\" default=\"0\" type=\"bool\" name=\"aligned\" ><name>Align</name></parameter></ktransition>";
+    QDomDocument ret;
+    ret.setContent(wipetrans);
+    transitions->append(ret.documentElement());
+
+    QString alphatrans = "<ktransition tag=\"composite\" id=\"alphatransparency\" ><name>Alpha transparency</name><description>Make alpha channel transparent</description><parameter tag=\"geometry\" type=\"fixed\" default=\"0%,0%:100%x100%\" name=\"geometry\"><name>Direction</name></parameter><parameter tag=\"fill\" default=\"0\" type=\"bool\" name=\"fill\" ><name>Rescale</name></parameter><parameter tag=\"aligned\" default=\"0\" type=\"bool\" name=\"aligned\" ><name>Align</name></parameter></ktransition>";
+    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 factor, QString namedesc, QString format) {
+
+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) {
     QDomElement parameter = doc.createElement("parameter");
     parameter.setAttribute("tag", tag);
     parameter.setAttribute("default", def);
@@ -581,6 +725,8 @@ QDomElement initEffects::quickParameterFill(QDomDocument & doc, QString name, QS
     parameter.setAttribute("min", min);
     if (!list.isEmpty())
         parameter.setAttribute("paramlist", list);
+    if (!listdisplaynames.isEmpty())
+        parameter.setAttribute("paramlistdisplay", listdisplaynames);
     if (!factor.isEmpty())
         parameter.setAttribute("factor", factor);
     if (!namedesc.isEmpty())