X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finiteffects.cpp;h=42d542a474464461be82e82e31e068343f732696;hb=2bb3e6b046c0ecd26ced536bd2bfd0487bc7fb06;hp=e4eb306904677c390c1d268b57c2dd2e3cd5ee36;hpb=9b0d40696d1298285d9f55b0ff68f6aa9fb1bae4;p=kdenlive

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index e4eb3069..42d542a4 100644
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -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");
@@ -127,6 +203,11 @@ Mlt::Repository *initEffects::parseEffectFiles() {
             // 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())
@@ -336,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) {
@@ -463,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");
@@ -522,38 +615,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"));
@@ -581,8 +687,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);
@@ -590,18 +697,23 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
 
 
         transitions->append(ret.documentElement());
-        kDebug() << "//// ////  TRANSITON XML";
-        kDebug() << ret.toString();
+        //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\" ><name>Wipe</name><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>";
+    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 listdisplaynames, QString factor, QString namedesc, QString format) {