From c0b3c1178382fd1e37555b5a5d9d6d9ae31e0159 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Wed, 22 Oct 2008 20:23:15 +0000 Subject: [PATCH] Allow comments in blacklist files for better understanding, blacklist frei0r effects that duplicate core MLT effects svn path=/branches/KDE4/; revision=2536 --- data/blacklisted_effects.txt | 7 +++++++ data/blacklisted_transitions.txt | 2 ++ src/initeffects.cpp | 6 ++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt index 61709e74..64758849 100644 --- 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 088ab0c5..9b9d92cb 100644 --- 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 748ce6d4..4c5454df 100644 --- 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(); -- 2.39.2