From 5353e35c43e0b59fed99afbf3fa2fac492502a0a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Tue, 26 Aug 2008 23:37:14 +0000 Subject: [PATCH] Fix effects xml svn path=/branches/KDE4/; revision=2382 --- effects/automask.xml | 3 +-- effects/boxblur.xml | 3 +-- effects/brightness.xml | 3 +-- effects/charcoal.xml | 3 +-- effects/chroma.xml | 3 +-- effects/chroma_hold.xml | 3 +-- effects/fadein.xml | 3 +-- effects/fadeout.xml | 3 +-- effects/gamma.xml | 3 +-- effects/greyscale.xml | 3 +-- effects/invert.xml | 3 +-- effects/ladspa_declipper.xml | 3 +-- effects/ladspa_equalizer.xml | 3 +-- effects/ladspa_limiter.xml | 3 +-- effects/ladspa_phaser.xml | 3 +-- effects/ladspa_pitch.xml | 3 +-- effects/ladspa_pitch_scale.xml | 3 +-- effects/ladspa_rate_scale.xml | 3 +-- effects/ladspa_reverb.xml | 3 +-- effects/ladspa_room_reverb.xml | 3 +-- effects/ladspa_vinyl.xml | 3 +-- effects/mirror.xml | 3 +-- effects/mute.xml | 3 +-- effects/normalise.xml | 3 +-- effects/obscure.xml | 3 +-- effects/rotation.xml | 3 +-- effects/sepia.xml | 3 +-- effects/sox_echo.xml | 3 +-- effects/sox_flanger.xml | 3 +-- effects/sox_pitch.xml | 3 +-- effects/sox_reverb.xml | 3 +-- effects/sox_vibro.xml | 3 +-- effects/threshold.xml | 3 +-- effects/volume.xml | 3 +-- effects/wave.xml | 3 +-- src/effectslist.cpp | 1 + src/initeffects.cpp | 17 +++++------------ 37 files changed, 41 insertions(+), 82 deletions(-) diff --git a/effects/automask.xml b/effects/automask.xml index 2c505a04..b5bbf706 100644 --- a/effects/automask.xml +++ b/effects/automask.xml @@ -1,9 +1,8 @@ - + Auto Mask Hide a selected zone and follow its movements Zachary Drew - Geometry diff --git a/effects/boxblur.xml b/effects/boxblur.xml index d8dbfde2..eba589d6 100644 --- a/effects/boxblur.xml +++ b/effects/boxblur.xml @@ -1,9 +1,8 @@ - + Box Blur Blur image with keyframes Leny Grisel - Blur factor diff --git a/effects/brightness.xml b/effects/brightness.xml index d281484d..2e31fe5a 100644 --- a/effects/brightness.xml +++ b/effects/brightness.xml @@ -1,9 +1,8 @@ - + Brightness Change image brightness with keyframes Charles Yates - Intensity diff --git a/effects/charcoal.xml b/effects/charcoal.xml index 3484fd28..3d85b359 100644 --- a/effects/charcoal.xml +++ b/effects/charcoal.xml @@ -1,9 +1,8 @@ - + Charcoal Charcoal drawing effect Charles Yates - Horizontal scatter diff --git a/effects/chroma.xml b/effects/chroma.xml index 3f4259bc..10b4e6a1 100644 --- a/effects/chroma.xml +++ b/effects/chroma.xml @@ -1,9 +1,8 @@ - + Blue Screen Make selected color transparent Charles Yates - Color key diff --git a/effects/chroma_hold.xml b/effects/chroma_hold.xml index eafea0ba..b31a5890 100644 --- a/effects/chroma_hold.xml +++ b/effects/chroma_hold.xml @@ -1,9 +1,8 @@ - + Chroma Hold Make image greyscale except for chosen color Charles Yates - Color key diff --git a/effects/fadein.xml b/effects/fadein.xml index 8b33b78d..f3703804 100644 --- a/effects/fadein.xml +++ b/effects/fadein.xml @@ -1,9 +1,8 @@ - + Fade in Fade in audio track - Duration diff --git a/effects/fadeout.xml b/effects/fadeout.xml index c2edee56..94abd3c0 100644 --- a/effects/fadeout.xml +++ b/effects/fadeout.xml @@ -1,9 +1,8 @@ - + Fade out Fade in audio track - Duration diff --git a/effects/gamma.xml b/effects/gamma.xml index 090a551d..7225dbfd 100644 --- a/effects/gamma.xml +++ b/effects/gamma.xml @@ -1,9 +1,8 @@ - + Gamma Change gamma color value Charles Yates - Gamma diff --git a/effects/greyscale.xml b/effects/greyscale.xml index 02f429ec..6c66301f 100644 --- a/effects/greyscale.xml +++ b/effects/greyscale.xml @@ -1,7 +1,6 @@ - + Greyscale Discard color information Charles Yates - \ No newline at end of file diff --git a/effects/invert.xml b/effects/invert.xml index 328e4182..68cde5fa 100644 --- a/effects/invert.xml +++ b/effects/invert.xml @@ -1,7 +1,6 @@ - + Invert Invert colors Charles Yates - \ No newline at end of file diff --git a/effects/ladspa_declipper.xml b/effects/ladspa_declipper.xml index 1454e45f..2e9203e3 100644 --- a/effects/ladspa_declipper.xml +++ b/effects/ladspa_declipper.xml @@ -1,7 +1,6 @@ - + Declipper LADSPA declipper audio effect http://www.ladspa.org - \ No newline at end of file diff --git a/effects/ladspa_equalizer.xml b/effects/ladspa_equalizer.xml index 41e23694..b3740003 100644 --- a/effects/ladspa_equalizer.xml +++ b/effects/ladspa_equalizer.xml @@ -1,9 +1,8 @@ - + Equalizer LADSPA equalizer audio effect http://www.ladspa.org - Lo gain diff --git a/effects/ladspa_limiter.xml b/effects/ladspa_limiter.xml index 5334e9e4..4640ac08 100644 --- a/effects/ladspa_limiter.xml +++ b/effects/ladspa_limiter.xml @@ -1,9 +1,8 @@ - + Limiter LADSPA limiter audio effect http://www.ladspa.org - Input gain (db) diff --git a/effects/ladspa_phaser.xml b/effects/ladspa_phaser.xml index 6a2a7287..af324e90 100644 --- a/effects/ladspa_phaser.xml +++ b/effects/ladspa_phaser.xml @@ -1,9 +1,8 @@ - + Phaser LADSPA phaser audio effect http://www.ladspa.org - Rate (Hz) diff --git a/effects/ladspa_pitch.xml b/effects/ladspa_pitch.xml index de102451..52be8fd5 100644 --- a/effects/ladspa_pitch.xml +++ b/effects/ladspa_pitch.xml @@ -1,9 +1,8 @@ - + Pitch Shift LADSPA change pitch audio effect http://www.ladspa.org - Shift diff --git a/effects/ladspa_pitch_scale.xml b/effects/ladspa_pitch_scale.xml index f929dba9..dff80fe1 100644 --- a/effects/ladspa_pitch_scale.xml +++ b/effects/ladspa_pitch_scale.xml @@ -1,9 +1,8 @@ - + Pitch Scaler LADSPA pitch scale audio effect http://www.ladspa.org - Co-efficient diff --git a/effects/ladspa_rate_scale.xml b/effects/ladspa_rate_scale.xml index 26242a1a..66eb2c25 100644 --- a/effects/ladspa_rate_scale.xml +++ b/effects/ladspa_rate_scale.xml @@ -1,9 +1,8 @@ - + Rate Scaler LADSPA rate scale audio effect http://www.ladspa.org - Rate diff --git a/effects/ladspa_reverb.xml b/effects/ladspa_reverb.xml index a726e0b9..c7041044 100644 --- a/effects/ladspa_reverb.xml +++ b/effects/ladspa_reverb.xml @@ -1,9 +1,8 @@ - + Reverb LADSPA reverb audio effect http://www.ladspa.org - Reverb time diff --git a/effects/ladspa_room_reverb.xml b/effects/ladspa_room_reverb.xml index 944b5373..d1b7e5f7 100644 --- a/effects/ladspa_room_reverb.xml +++ b/effects/ladspa_room_reverb.xml @@ -1,9 +1,8 @@ - + Room Reverb LADSPA room reverb audio effect http://www.ladspa.org - Room size (m) diff --git a/effects/ladspa_vinyl.xml b/effects/ladspa_vinyl.xml index 9a367a52..7efc3e93 100644 --- a/effects/ladspa_vinyl.xml +++ b/effects/ladspa_vinyl.xml @@ -1,9 +1,8 @@ - + Vinyl Simulates a vinyl audio player - LADSPA audio effect http://www.ladspa.org - Year diff --git a/effects/mirror.xml b/effects/mirror.xml index 024978ab..7ca6557d 100644 --- a/effects/mirror.xml +++ b/effects/mirror.xml @@ -1,9 +1,8 @@ - + Mirror Flip your image in any direction Charles Yates - Mirroring direction diff --git a/effects/mute.xml b/effects/mute.xml index bf842a8d..c0d5dc95 100644 --- a/effects/mute.xml +++ b/effects/mute.xml @@ -1,9 +1,8 @@ - + Mute Mute clip Dan Dennedy - Gain diff --git a/effects/normalise.xml b/effects/normalise.xml index 5d342f59..e2947638 100644 --- a/effects/normalise.xml +++ b/effects/normalise.xml @@ -1,9 +1,8 @@ - + Normalise Normalise audio volume Dan Dennedy - Gain diff --git a/effects/obscure.xml b/effects/obscure.xml index ef302882..95d4cb6e 100644 --- a/effects/obscure.xml +++ b/effects/obscure.xml @@ -1,5 +1,5 @@ - + Obscure Hide a region of the clip Charles Yates @@ -8,7 +8,6 @@ - Region diff --git a/effects/rotation.xml b/effects/rotation.xml index 5e98f5d6..922be381 100644 --- a/effects/rotation.xml +++ b/effects/rotation.xml @@ -1,9 +1,8 @@ - + Rotate Rotate clip in any 3 directions Charles Yates - Rotation x diff --git a/effects/sepia.xml b/effects/sepia.xml index 04279191..5ffc736d 100644 --- a/effects/sepia.xml +++ b/effects/sepia.xml @@ -1,9 +1,8 @@ - + Sepia Turn clip colors to sepia Charles Yates - Chrominance U diff --git a/effects/sox_echo.xml b/effects/sox_echo.xml index ad6f7a17..a384feeb 100644 --- a/effects/sox_echo.xml +++ b/effects/sox_echo.xml @@ -1,9 +1,8 @@ - + Sox Echo Sox echo audio effect http://sox.sourceforge.net - Gain in diff --git a/effects/sox_flanger.xml b/effects/sox_flanger.xml index ccf2c09e..fdbf7f12 100644 --- a/effects/sox_flanger.xml +++ b/effects/sox_flanger.xml @@ -1,9 +1,8 @@ - + Sox Flanger Sox flanger audio effect http://sox.sourceforge.net - Gain in diff --git a/effects/sox_pitch.xml b/effects/sox_pitch.xml index 802ebac9..5b7f0ff6 100644 --- a/effects/sox_pitch.xml +++ b/effects/sox_pitch.xml @@ -1,9 +1,8 @@ - + Sox Pitch Shift Sox change pitch audio effect http://sox.sourceforge.net - Shift diff --git a/effects/sox_reverb.xml b/effects/sox_reverb.xml index 6f854049..c1203e7a 100644 --- a/effects/sox_reverb.xml +++ b/effects/sox_reverb.xml @@ -1,9 +1,8 @@ - + Sox Reverb Sox reverb audio effect http://sox.sourceforge.net - Gain out diff --git a/effects/sox_vibro.xml b/effects/sox_vibro.xml index 0e2fc26f..479122e6 100644 --- a/effects/sox_vibro.xml +++ b/effects/sox_vibro.xml @@ -1,9 +1,8 @@ - + Sox Vibro Sox vibro audio effect http://sox.sourceforge.net - Speed diff --git a/effects/threshold.xml b/effects/threshold.xml index edde678b..6a38fee0 100644 --- a/effects/threshold.xml +++ b/effects/threshold.xml @@ -1,9 +1,8 @@ - + Threshold Make monochrome clip Charles Yates - Threshold value diff --git a/effects/volume.xml b/effects/volume.xml index 1eaa6e0c..1d3031a9 100644 --- a/effects/volume.xml +++ b/effects/volume.xml @@ -1,9 +1,8 @@ - + Volume Adjust audio volume with keyframes Dan Dennedy - Gain diff --git a/effects/wave.xml b/effects/wave.xml index d2e462fc..48070c3c 100644 --- a/effects/wave.xml +++ b/effects/wave.xml @@ -1,9 +1,8 @@ - + Wave Make waves on your clip with keyframes Leny Grisel - Amplitude diff --git a/src/effectslist.cpp b/src/effectslist.cpp index 91deb31a..a6aef7aa 100644 --- a/src/effectslist.cpp +++ b/src/effectslist.cpp @@ -70,6 +70,7 @@ QDomElement EffectsList::getEffectByTag(const QString & tag, const QString & id) if (!id.isEmpty()) for (int i = 0; i < this->size(); ++i) { QDomElement effect = this->at(i); + kDebug() << "// SRCH EFFECT; " << id << ", LKING: " << effect.attribute("id"); if (effect.attribute("id") == id) { QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { diff --git a/src/initeffects.cpp b/src/initeffects.cpp index b8468045..5c97b461 100644 --- a/src/initeffects.cpp +++ b/src/initeffects.cpp @@ -192,14 +192,10 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *au // Parse effect file if ((filtersList.contains(tag) || producersList.contains(tag)) && ladspaOk) { bool isAudioEffect = false; - QDomNode propsnode = documentElement.elementsByTagName("properties").item(0); - if (!propsnode.isNull()) { - QDomElement propselement = propsnode.toElement(); - QString type = propselement.attribute("type", QString::null); - if (type == "audio") audioEffectList->append(documentElement); - else if (type == "custom") customEffectList->append(documentElement); - else videoEffectList->append(documentElement); - } else videoEffectList->append(documentElement); + QString type = documentElement.attribute("type", QString::null); + if (type == "audio") audioEffectList->append(documentElement); + else if (type == "custom") customEffectList->append(documentElement); + else videoEffectList->append(documentElement); } /* @@ -399,6 +395,7 @@ QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, if (metadata->get("title") && metadata->get("identifier")) { QDomElement eff = ret.createElement("effect"); eff.setAttribute("tag", metadata->get("identifier")); + eff.setAttribute("id", metadata->get("identifier")); QDomElement name = ret.createElement("name"); name.appendChild(ret.createTextNode(metadata->get("title"))); @@ -409,13 +406,9 @@ QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, QDomElement author = ret.createElement("author"); author.appendChild(ret.createTextNode(metadata->get("creator"))); - QDomElement prop = ret.createElement("properties"); - prop.setAttribute("id", metadata->get("identifier")); - prop.setAttribute("tag", metadata->get("identifier")); eff.appendChild(name); eff.appendChild(author); eff.appendChild(desc); - eff.appendChild(prop); Mlt::Properties param_props((mlt_properties) metadata->get_data("parameters")); for (int j = 0; param_props.is_valid() && j < param_props.count();j++) { -- 2.39.5