Allow transition blacklist, add Composition to fix:

http://www.kdenlive.org:80/mantis/view.php?id=252

svn path=/branches/KDE4/; revision=2534

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 656b7e78b0e9b9a2db022c85bd159091175f9df7..2287e6d9ab0ad210c398a6048711a14c63b43460 100644 (file)
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1 +1 @@
-install(FILES banner.png timeline_nothumbs.png timeline_athumbs.png timeline_vthumbs.png timeline_avthumbs.png transition.png metadata.properties blacklisted_effects.txt DESTINATION ${DATA_INSTALL_DIR}/kdenlive )
+install(FILES banner.png timeline_nothumbs.png timeline_athumbs.png timeline_vthumbs.png timeline_avthumbs.png transition.png metadata.properties blacklisted_effects.txt blacklisted_transitions.txt DESTINATION ${DATA_INSTALL_DIR}/kdenlive )

diff --git a/data/blacklisted_transitions.txt b/data/blacklisted_transitions.txt
new file mode 100644 (file)
index 0000000..088ab0c
--- /dev/null
+++ b/data/blacklisted_transitions.txt
@@ -0,0 +1 @@
+frei0r.composition

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index 1fec379f6840e447b539f81632734c55e02c7049..748ce6d4d2c5e158c3e115a8e48aa4e64e9d7542 100644 (file)
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -97,6 +97,20 @@ Mlt::Repository *initEffects::parseEffectFiles() {
     }
     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()) {
+            blackListedtransitions.append(in.readLine().simplified());
+        }
+    }
+    file2.close();
+
     for (int i = 0 ; i < filters->count() ; i++) {
         filtersList << filters->get_name(i);
     }
@@ -117,6 +131,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");