Allow comments in blacklist files for better understanding, blacklist frei0r effects...

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

diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt
index 61709e749f11d7ac8e065e31e885646da2661824..6475884967db037ea06b1161f258d5b19b802ead 100644 (file)
--- a/data/blacklisted_effects.txt
+++ b/data/blacklisted_effects.txt
@@ -1,2 +1,9 @@
+# crashing effects
 frei0r.squareblur
 frei0r.water
+
+# duplicate effects
+frei0r.gamma
+frei0r.bw0r
+frei0r.flippo
+frei0r.invert0r

diff --git a/data/blacklisted_transitions.txt b/data/blacklisted_transitions.txt
index 088ab0c57f5a16d05cc4bccf193d7e6453cc407b..9b9d92cb9f42411672c056448b3f54c1d8a1659c 100644 (file)
--- a/data/blacklisted_transitions.txt
+++ b/data/blacklisted_transitions.txt
@@ -1 +1,3 @@
+# crashing transitions
+
 frei0r.composition

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index 748ce6d4d2c5e158c3e115a8e48aa4e64e9d7542..4c5454dfb40d8c0d2e1d71e366646de28fc8b89d 100644 (file)
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -92,7 +92,8 @@ 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();
@@ -106,7 +107,8 @@ Mlt::Repository *initEffects::parseEffectFiles() {
     if (file2.open(QIODevice::ReadOnly)) {
         QTextStream in(&file2);
         while (!in.atEnd()) {
-            blackListedtransitions.append(in.readLine().simplified());
+           QString black = in.readLine().simplified();
+            if (!black.isEmpty() && !black.startsWith('#')) blackListedtransitions.append(black);
         }
     }
     file2.close();