Fix a bunch of effects XML and registration.

svn path=/trunk/kdenlive/; revision=5490

diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt
index a4e28890ec8bcdfd8e41e469ad92c06286fddc19..cf718c655c7996709927f41f335460cdfa28aeb8 100644 (file)
--- a/data/blacklisted_effects.txt
+++ b/data/blacklisted_effects.txt
@@ -1,28 +1,27 @@
 # crashing effects
-frei0r.facedetect
 frei0r.transparency
 frei0r.water
 
 # duplicate effects
 frei0r.bluescreen0r
 frei0r.bw0r
-frei0r.flippo
 frei0r.gamma
 frei0r.invert0r
-frei0r.twolay0r
 
-# effects with XML UI
+# unusable effects
 frei0r.3dflippo
+frei0r.perspective
+
+# effects with XML UI
 frei0r.alpha0ps
 frei0r.alphagrad
 frei0r.alphaspot
 frei0r.balanc0r
-frei0r_baltan.xml
-frei0r.bluescreen0r
-frei0r_bw0r.xml
+frei0r.baltan
+frei0r.bw0r
 frei0r.brightness
-frei0r.Cartoon
-frei0r.KMeansClustering
+frei0r.cartoon
+frei0r.cluster
 frei0r.c0rners
 frei0r.coloradj_RGB
 frei0r.colordistance
@@ -30,44 +29,43 @@ frei0r.contrast0r
 frei0r.curves
 frei0r.defish0r
 frei0r.delay0r
-frei0r_delaygrab.xml
+frei0r.delaygrab
 frei0r.d90stairsteppingfix
 frei0r.distort0r
-frei0r.Edgeglow
-frei0r.Equaliz0r
-frei0r_flippo.xml
+frei0r.edgeglow
+frei0r.equaliz0r
+frei0r.flippo
 frei0r.glow
 frei0r.hqdn3d
 frei0r.hueshift0r
 frei0r.lenscorrection
-frei0r.LetterB0xed
+frei0r.letterb0xed
 frei0r.levels
 frei0r.lightgraffiti
-frei0r.Luminance
-frei0r.Mask0Mate
-frei0r_nervous.xml
+frei0r.luminance
+frei0r.mask0mate
+frei0r.nervous
 frei0r.nosync0r
-frei0r.Perspective
 frei0r.pixeliz0r
 frei0r.pr0be
 frei0r.pr0file
-frei0r_primaries.xml
-frei0r_rgbparade.xml
+frei0r.primaries
+frei0r.rgbparade
 frei0r.saturat0r
 frei0r.scale0tilt
 frei0r.scanline0r
 frei0r.select0r
 frei0r.sharpness
-frei0r.Sobel
+frei0r.sobel
 frei0r.sopsat
 frei0r.squareblur
-frei0r.TehRoxx0r
+frei0r.tehRoxx0r
 frei0r.three_point_balance
-frei0r_threelay0r.xml
+frei0r.threelay0r
 frei0r.threshold0r
 frei0r.tint0r
-frei0r_twolay0r.xml
-frei0r_vectorscope.xml
+frei0r.twolay0r
+frei0r.vectorscope
 frei0r.vertigo
 
 #MLT effects with XML UI
@@ -78,6 +76,7 @@ lines
 oldfilm
 tcolor
 rotoscoping
+wave
 
 #effects that have simplekeyframes
 vignette

diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index c293b5145a71ba55b6c34f9c2ce5f71cdf74b640..338133dd8468896cf3a197b287ad8c4f1a213155 100644 (file)
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -48,16 +48,13 @@ volume.xml
 wave.xml
 fadein.xml
 fadeout.xml
-frei0r_3dflippo.xml
 frei0r_alpha0ps.xml
 frei0r_alphagrad.xml
 frei0r_alphaspot.xml
 frei0r_balanc0r.xml
 frei0r_baltan.xml
 frei0r_bezier_curves.xml
-frei0r_bluescreen0r.xml
 frei0r_brightness.xml
-frei0r_bw0r.xml
 frei0r_cartoon.xml
 frei0r_cluster.xml
 frei0r_coloradj_rgb.xml
@@ -84,7 +81,6 @@ frei0r_luminance.xml
 frei0r_mask0mate.xml
 frei0r_nervous.xml
 frei0r_nosync0r.xml
-frei0r_perspective.xml
 frei0r_pixeliz0r.xml
 frei0r_pr0be.xml
 frei0r_pr0file.xml

diff --git a/effects/frei0r_3dflippo.xml b/effects/frei0r_3dflippo.xml
index b7cd946bc48f6ef1353c1c7778fde62a072b7e52..7a9f2c24cbc6352c5554a8451218c345aedf24f0 100644 (file)
--- a/effects/frei0r_3dflippo.xml
+++ b/effects/frei0r_3dflippo.xml
@@ -3,28 +3,28 @@
        <name>3dflippo</name>
        <description>Frame rotation in 3D space</description>
        <author>c.e. prelz AS FLUIDO</author>
-       <parameter type="double" name="Xaxisrotation" max="1000" min="0" default="0">
+       <parameter type="constant" name="Xaxisrotation" max="1000" min="0" default="500" factor="1000">
                <name>X axis rotation</name>
        </parameter>
-       <parameter type="double" name="Yaxisrotation" max="1000" min="0" default="0">
+       <parameter type="constant" name="Yaxisrotation" max="1000" min="0" default="500" factor="1000">
                <name>Y axis rotation</name>
        </parameter>
-       <parameter type="double" name="Zaxisrotation" max="1000" min="0" default="0">
+       <parameter type="constant" name="Zaxisrotation" max="1000" min="0" default="500" factor="1000">
                <name>Z axis rotation</name>
        </parameter>
-       <parameter type="double" name="Xaxisrotationrate" max="1000" min="0" default="0">
+       <parameter type="constant" name="Xaxisrotationrate" max="1000" min="0" default="500" factor="1000">
                <name>X axis rotation rate</name>
        </parameter>
-       <parameter type="double" name="Yaxisrotationrate" max="1000" min="0" default="0">
+       <parameter type="constant" name="Yaxisrotationrate" max="1000" min="0" default="500" factor="1000">
                <name>Y axis rotation rate</name>
        </parameter>
-       <parameter type="double" name="Zaxisrotationrate" max="1000" min="0" default="0">
+       <parameter type="constant" name="Zaxisrotationrate" max="1000" min="0" default="500" factor="1000">
                <name>Z axis rotation rate</name>
        </parameter>
-       <parameter type="double" name="CenterpositionX" max="1000" min="0" default="0">
+       <parameter type="constant" name="CenterpositionX" max="1000" min="0" default="500" factor="1000">
                <name>Center position (X)</name>
        </parameter>
-       <parameter type="double" name="CenterpositionY" max="1000" min="0" default="0">
+       <parameter type="constant" name="CenterpositionY" max="1000" min="0" default="500" factor="1000">
                <name>Center position (Y)</name>
        </parameter>
        <parameter type="bool" name="Invertrotationassignment" default="1">

diff --git a/effects/frei0r_bluescreen0r.xml b/effects/frei0r_bluescreen0r.xml
deleted file mode 100644 (file)
index 95cb8af..0000000
--- a/effects/frei0r_bluescreen0r.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE kpartgui>
-<effect tag="frei0r.bluescreen0r" id="frei0r.bluescreen0r" type="video" unique="1">
-       <name>bluescreen0r</name>
-       <description>Color to alpha (blit SRCALPHA)</description>
-       <author>Hedde Bosman</author>
-       <parameter type="double" name="Color" max="1000" min="0" default="0">
-               <name>Color</name>
-       </parameter>
-       <parameter type="double" name="Distance" max="1000" min="0" default="0">
-               <name>Distance</name>
-       </parameter>
-</effect>

diff --git a/effects/frei0r_bw0r.xml b/effects/frei0r_bw0r.xml
deleted file mode 100644 (file)
index c527b42..0000000
--- a/effects/frei0r_bw0r.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE kpartgui>
-<effect tag="frei0r.bw0r" id="frei0r.bw0r">
-       <name>Black and White</name>
-       <description>Turns image black/white</description>
-       <author>coma@gephex.org</author>
-</effect>

diff --git a/effects/frei0r_cartoon.xml b/effects/frei0r_cartoon.xml
index 2f721e153eabed94f030bd351297ae927d458104..09846f4440d6029aca10ed6e95821e148018c1cc 100644 (file)
--- a/effects/frei0r_cartoon.xml
+++ b/effects/frei0r_cartoon.xml
@@ -1,12 +1,12 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.Cartoon" id="frei0r.Cartoon" type="video" unique="1">
+<effect tag="frei0r.cartoon" id="frei0r.cartoon" type="video" unique="1">
        <name>Cartoon</name>
        <description>Cartoonify video, do a form of edge detect</description>
        <author>Dries Pruimboom, Jaromil</author>
-       <parameter type="double" name="triplevel" max="1000" min="0" default="0">
+       <parameter type="constant" name="triplevel" max="1000" min="0" default="500">
                <name>Level of trip</name>
        </parameter>
-       <parameter type="double" name="diffspace" max="256" min="0" default="0">
+       <parameter type="constant" name="diffspace" max="256" min="0" default="1">
                <name>Difference space</name>
        </parameter>
 </effect>

diff --git a/effects/frei0r_cluster.xml b/effects/frei0r_cluster.xml
index 6a49abfa102a19faf83edfa64fac0175beb72088..f4e990ddfa2344eaca93f3b7201d225593f51e28 100644 (file)
--- a/effects/frei0r_cluster.xml
+++ b/effects/frei0r_cluster.xml
@@ -1,12 +1,12 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.KMeansClustering" id="frei0r.KMeansClustering" type="video" unique="1">
+<effect tag="frei0r.cluster" id="frei0r.cluster" type="video" unique="1">
        <name>K-Means Clustering</name>
        <description>Clusters of a source image by color and spatial distance</description>
        <author>binarymillenium</author>
-       <parameter type="double" name="Num" max="40" min="0" default="0">
+       <parameter type="constant" name="Num" max="40" min="0" default="20" factor="1">
                <name>Amount of clusters</name>
        </parameter>
-       <parameter type="double" name="Dist weight" max="1000" min="0" default="0">
+       <parameter type="constant" name="Dist weight" max="1000" min="0" default="500" factor="1000">
                <name>Weight on distance</name>
        </parameter>
 </effect>

diff --git a/effects/frei0r_delay0r.xml b/effects/frei0r_delay0r.xml
index df67d9100451e8f0354f976969d9f03e12655a89..690348ea235da479162019568403184d0dc7558d 100644 (file)
--- a/effects/frei0r_delay0r.xml
+++ b/effects/frei0r_delay0r.xml
@@ -3,7 +3,7 @@
        <name>delay0r</name>
        <description>Video delay</description>
        <author>Martin Bayer</author>
-       <parameter type="double" name="DelayTime" max="1000" min="0" default="0">
+       <parameter type="constant" name="DelayTime" max="1000" min="0" default="0" factor="1000">
                <name>Delay time</name>
        </parameter>
 </effect>

diff --git a/effects/frei0r_edgeglow.xml b/effects/frei0r_edgeglow.xml
index f4937cfa4fed1ac9a3cfd2348131e11f6f725f48..2333a09e485eb3df23f6bab8954146f4f05ec6ab 100644 (file)
--- a/effects/frei0r_edgeglow.xml
+++ b/effects/frei0r_edgeglow.xml
@@ -1,15 +1,15 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.Edgeglow" id="frei0r.Edgeglow" type="video" unique="1">
+<effect tag="frei0r.edgeglow" id="frei0r.edgeglow" type="video" unique="1">
        <name>Edge glow</name>
        <description>Edge glow filter</description>
        <author>Salsaman</author>
-       <parameter type="double" name="lthresh" max="1000" min="0" default="0">
+       <parameter type="constant" name="lthresh" max="1000" min="0" default="0" factor="1000">
                <name>Edge lightening threshold</name>
        </parameter>
-       <parameter type="double" name="lupscale" max="1000" min="0" default="0">
+       <parameter type="constant" name="lupscale" max="1000" min="0" default="0" factor="1000">
                <name>Edge brightness upscaling multiplier</name>
        </parameter>
-       <parameter type="double" name="lredscale" max="1000" min="0" default="0">
+       <parameter type="constant" name="lredscale" max="1000" min="0" default="0" factor="1000">
                <name>Non-edge brightness downscaling multiplier</name>
        </parameter>
 </effect>

diff --git a/effects/frei0r_equaliz0r.xml b/effects/frei0r_equaliz0r.xml
index 6dcb046f539632be9a0beee81c914144d1201533..22e3a8023e2806ba2f716c324166dd5e350024aa 100644 (file)
--- a/effects/frei0r_equaliz0r.xml
+++ b/effects/frei0r_equaliz0r.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.Equaliz0r" id="frei0r.Equaliz0r" type="video" unique="1">
+<effect tag="frei0r.equaliz0r" id="frei0r.equaliz0r" type="video" unique="1">
        <name>Equaliz0r</name>
        <description>Equalizes the intensity histograms</description>
        <author>Jean-Sebastien Senecal (Drone)</author>

diff --git a/effects/frei0r_letterb0xed.xml b/effects/frei0r_letterb0xed.xml
index 170ea1fbd687b34a4ec6156f52721cbcefb4fa73..4f3ad47d4822f6ddb579593c1ab963cf860375aa 100644 (file)
--- a/effects/frei0r_letterb0xed.xml
+++ b/effects/frei0r_letterb0xed.xml
@@ -1,12 +1,12 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.LetterB0xed" id="frei0r.LetterB0xed" type="video" unique="1">
+<effect tag="frei0r.letterb0xed" id="frei0r.letterb0xed" type="video" unique="1">
        <name>LetterB0xed</name>
        <description>Adds black borders at top and bottom for cinema look</description>
        <author>Richard Spindler</author>
-       <parameter type="double" name="BorderWidth" max="1000" min="0" default="0">
+       <parameter type="constant" name="Border Width" max="1000" min="0" default="400" factor="1000">
                <name>Border Width</name>
        </parameter>
-       <parameter type="double" name="Transparency" max="1000" min="0" default="0">
+       <parameter type="bool" name="Transparency" default="0">
                <name>Transparency</name>
        </parameter>
 </effect>

diff --git a/effects/frei0r_luminance.xml b/effects/frei0r_luminance.xml
index ba415175685700e1b0d747ecac561840f6adc631..4da7745d14e955bc666d181417f2b7722ed0c533 100644 (file)
--- a/effects/frei0r_luminance.xml
+++ b/effects/frei0r_luminance.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.Luminance" id="frei0r.Luminance" type="video" unique="1">
+<effect tag="frei0r.luminance" id="frei0r.luminance" type="video" unique="1">
        <name>Luminance</name>
        <description>Creates a luminance map of the image</description>
        <author>Richard Spindler</author>

diff --git a/effects/frei0r_mask0mate.xml b/effects/frei0r_mask0mate.xml
index fe0d5acc66c5067be4fa9c815196e66d279a36f4..885f01eb9ae3d4f4ef89893339c7099947be0b8b 100644 (file)
--- a/effects/frei0r_mask0mate.xml
+++ b/effects/frei0r_mask0mate.xml
@@ -1,24 +1,24 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.Mask0Mate" id="frei0r.Mask0Mate" type="video" unique="1">
+<effect tag="frei0r.mask0mate" id="frei0r.mask0mate" type="video" unique="1">
        <name>Mask0Mate</name>
        <description>Creates an square alpha-channel mask</description>
        <author>Richard Spindler</author>
-       <parameter type="double" name="Left" max="1000" min="0" default="0">
+       <parameter type="constant" name="Left" max="1000" min="0" default="0" factor="1000">
                <name>Left</name>
        </parameter>
-       <parameter type="double" name="Right" max="1000" min="0" default="0">
+       <parameter type="constant" name="Right" max="1000" min="0" default="0" factor="1000">
                <name>Right</name>
        </parameter>
-       <parameter type="double" name="Top" max="1000" min="0" default="0">
+       <parameter type="constant" name="Top" max="1000" min="0" default="0" factor="1000">
                <name>Top</name>
        </parameter>
-       <parameter type="double" name="Bottom" max="1000" min="0" default="0">
+       <parameter type="constant" name="Bottom" max="1000" min="0" default="0" factor="1000">
                <name>Bottom</name>
        </parameter>
        <parameter type="bool" name="Invert" default="1">
                <name>Invert</name>
        </parameter>
-       <parameter type="double" name="Blur" max="1000" min="0" default="0">
+       <parameter type="constant" name="Blur" max="1000" min="0" default="0" factor="1000">
                <name>Blur</name>
        </parameter>
 </effect>

diff --git a/effects/frei0r_nosync0r.xml b/effects/frei0r_nosync0r.xml
index 1ec44ff5de9f191ced010ece7a671a214e34d38d..8e2d4cb86b0aa724d4fbac2e66a4398a242adb15 100644 (file)
--- a/effects/frei0r_nosync0r.xml
+++ b/effects/frei0r_nosync0r.xml
@@ -3,7 +3,7 @@
        <name>nosync0r</name>
        <description>Broken TV</description>
        <author>Martin Bayer</author>
-       <parameter type="double" name="HSync" max="1000" min="0" default="0">
+       <parameter type="constant" name="HSync" max="1000" min="0" default="0" factor="1000">
                <name>HSync</name>
        </parameter>
 </effect>

diff --git a/effects/frei0r_perspective.xml b/effects/frei0r_perspective.xml
deleted file mode 100644 (file)
index 55bd5cb..0000000
--- a/effects/frei0r_perspective.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE kpartgui>
-<effect tag="frei0r.Perspective" id="frei0r.Perspective" type="video" unique="1">
-       <name>Perspective</name>
-       <description>Distorts the image for a pseudo perspective</description>
-       <author>Richard Spindler</author>
-       <parameter type="double" name="Top Left" max="1000" min="0" default="0">
-               <name>Top Left</name>
-       </parameter>
-       <parameter type="double" name="Top Right" max="1000" min="0" default="0">
-               <name>Top Right</name>
-       </parameter>
-       <parameter type="double" name="Bottom Left" max="1000" min="0" default="0">
-               <name>Bottom Left</name>
-       </parameter>
-       <parameter type="double" name="Bottom Right" max="1000" min="0" default="0">
-               <name>Bottom Right</name>
-       </parameter>
-</effect>

diff --git a/effects/frei0r_primaries.xml b/effects/frei0r_primaries.xml
index 42338e8af8e79cb660a1c9b834c08f2233bf91e1..88e4c30af01acacac6a47a1adac1101f9ebb84e0 100644 (file)
--- a/effects/frei0r_primaries.xml
+++ b/effects/frei0r_primaries.xml
@@ -3,7 +3,7 @@
        <name>Primaries</name>
        <description>Reduce image to primary colors</description>
        <author>Hedde Bosman</author>
-       <parameter type="double" name="Factor" max="1000" min="0" default="1">
+       <parameter type="constant" name="Factor" max="32" min="0" default="1">
                <name>Factor</name>
                <comment><![CDATA[Influence of mean px value, > 32 = 0]]></comment>
        </parameter>

diff --git a/effects/frei0r_sobel.xml b/effects/frei0r_sobel.xml
index 1f77c34d2584d6795e2a2ab298fcf0a721291e14..3fc4e81ee7e03504f8292b6473009ba876a7617c 100644 (file)
--- a/effects/frei0r_sobel.xml
+++ b/effects/frei0r_sobel.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.Sobel" id="frei0r.Sobel" type="video" unique="1">
+<effect tag="frei0r.sobel" id="frei0r.sobel" type="video" unique="1">
        <name>Sobel</name>
        <description>Sobel filter</description>
        <author>Jean-Sebastien Senecal (Drone)</author>

diff --git a/effects/frei0r_tehroxx0r.xml b/effects/frei0r_tehroxx0r.xml
index 75bcf7fb91fcf28740429ea65ba09ac2c6a6afa2..cc47c7fdfb95f0472339c681e9a703a8ec1f173d 100644 (file)
--- a/effects/frei0r_tehroxx0r.xml
+++ b/effects/frei0r_tehroxx0r.xml
@@ -1,9 +1,9 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.TehRoxx0r" id="frei0r.TehRoxx0r" type="video" unique="1">
+<effect tag="frei0r.tehRoxx0r" id="frei0r.tehRoxx0r" type="video" unique="1">
        <name>TehRoxx0r</name>
        <description>Something videowall-ish</description>
        <author>Coma</author>
-       <parameter type="double" name="Interval" max="1000" min="0" default="0">
+       <parameter type="constant" name="Interval" max="1000" min="0" default="0" factor="1000">
                <name>Interval</name>
        </parameter>
 </effect>

diff --git a/effects/wave.xml b/effects/wave.xml
index 48070c3cc6a42cc62dfa82d9e48009af9f2657e7..a0da2d4ca75c4e2434ebb6043854470f4b0a2640 100644 (file)
--- a/effects/wave.xml
+++ b/effects/wave.xml
@@ -6,10 +6,10 @@
        <parameter type="keyframe" name="start" max="100" min="0" default="5">
                <name>Amplitude</name>
        </parameter>
-       <parameter type="constant" name="deformX" max="100" min="0" default="1">
-               <name>Horizontal factor</name>
+       <parameter type="bool" name="deformX" default="1">
+               <name>Horizontal</name>
        </parameter>
-       <parameter type="constant" name="deformY" max="100" min="0" default="1">
-               <name>Vertical factor</name>
+       <parameter type="bool" name="deformY" default="0">
+               <name>Vertical</name>
        </parameter>
 </effect>