From: Jean-Baptiste M. <jb...@kd...> - 2013-02-16 20:04:27
|
Git commit 95c1b919216c269526340edea7ec1cb3151ddfef by Jean-Baptiste Mardelle. Committed on 16/02/2013 at 21:04. Pushed by mardelle into branch 'v0.9'. Fix some MLT effects (Mono to Stereo was showing twice the "To" param) M +3 -3 data/blacklisted_effects.txt M +1 -1 effects/channelcopy.xml M +16 -5 src/initeffects.cpp http://commits.kde.org/kdenlive/95c1b919216c269526340edea7ec1cb3151ddfef diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt index 276248f..d54044b 100644 --- a/data/blacklisted_effects.txt +++ b/data/blacklisted_effects.txt @@ -75,6 +75,8 @@ frei0r.vignette #MLT effects with XML UI +channelcopy +crop dust grain lines @@ -82,10 +84,8 @@ oldfilm tcolor rotoscoping wave -volume vignette -crop - +volume #Effects not usable with a simple GUI sox diff --git a/effects/channelcopy.xml b/effects/channelcopy.xml index 9223899..ca96a79 100644 --- a/effects/channelcopy.xml +++ b/effects/channelcopy.xml @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> - <effect tag="channelcopy" id="channelcopy" type="audio"> + <effect tag="channelcopy" id="stereocopy" type="audio"> <name>Mono to stereo</name> <description>Copy one channel to another</description> <author>Dan Dennedy</author> diff --git a/src/initeffects.cpp b/src/initeffects.cpp index d7a190d..df29192 100644 --- a/src/initeffects.cpp +++ b/src/initeffects.cpp @@ -200,8 +200,10 @@ void initEffects::parseEffectFiles(const QString &locale) while (!in.atEnd()) { QString black = in.readLine().simplified(); if (!black.isEmpty() && !black.startsWith('#') && - mltFiltersList.contains(black)) + mltFiltersList.contains(black)) { mltFiltersList.removeAll(black); + } + } file2.close(); } @@ -242,7 +244,9 @@ void initEffects::parseEffectFiles(const QString &locale) if (desc.startsWith("Process audio using a SoX")) { // Remove MLT's SOX generated effects since the parameters properties are unusable for us } - else audioEffectsMap.insert(doc.documentElement().firstChildElement("name").text().toLower().toUtf8().data(), doc.documentElement()); + else { + audioEffectsMap.insert(doc.documentElement().firstChildElement("name").text().toLower().toUtf8().data(), doc.documentElement()); + } } } else @@ -481,16 +485,23 @@ QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, QDomElement params = ret.createElement("parameter"); Mlt::Properties paramdesc((mlt_properties) param_props.get_data(param_props.get_name(j))); - params.setAttribute("name", paramdesc.get("identifier")); + if (params.attribute("name") == "argument") { + // This parameter has to be given as attribute when using command line, do not show it in Kdenlive + continue; + } if (paramdesc.get("maximum")) params.setAttribute("max", paramdesc.get("maximum")); if (paramdesc.get("minimum")) params.setAttribute("min", paramdesc.get("minimum")); QString paramType = paramdesc.get("type"); - if (paramType == "integer") - params.setAttribute("type", "constant"); + if (paramType == "integer") { + if (params.attribute("min") == "0" && params.attribute("max") == "1") + params.setAttribute("type", "bool"); + else params.setAttribute("type", "constant"); + + } else if (paramType == "float") { params.setAttribute("type", "constant"); // param type is float, set default decimals to 3 |