SOP/Sat Filter GUI added.

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

diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt
index 9df9cc83cdc6beb0c39d94495fb9ac7b856a7d51..ae7184dd2ba17db386ebb11f3a259af8692456d0 100644 (file)
--- a/data/blacklisted_effects.txt
+++ b/data/blacklisted_effects.txt
@@ -19,6 +19,7 @@ frei0r.contrast0r
 frei0r.brightness
 frei0r.lenscorrection
 frei0r.saturat0r
+frei0r.sopsat
 frei0r.vertigo
 frei0r.curves
 frei0r.levels

diff --git a/data/kdenliveeffectscategory.rc b/data/kdenliveeffectscategory.rc
index 5ab85a8bccfeaf8b06917778eaf6e331cd838052..1c37a24e985be56bab7322d11242914364d01faa 100644 (file)
--- a/data/kdenliveeffectscategory.rc
+++ b/data/kdenliveeffectscategory.rc
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 <data name="effects" version="0">
-  <group list="brightness,gamma,frei0r.balanc0r,frei0r.brightness,frei0r.levels,frei0r.three_point_balance,frei0r.curves,frei0r.coloradj_RGB">
+  <group list="brightness,gamma,frei0r.balanc0r,frei0r.brightness,frei0r.levels,frei0r.three_point_balance,frei0r.curves,frei0r.coloradj_RGB,frei0r.sopsat">
     <text>Colour correction</text>
   </group>
   <group list="invert,sepia,tcolor,greyscale,frei0r.B,frei0r.G,frei0r.R,frei0r.contrast0r,frei0r.saturat0r,frei0r.tint0r,frei0r.primaries,frei0r.rgbparade,chroma_hold,frei0r.hueshift0r">

diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index d79d02b33f5687001734a6dea7baceb4d0d88c15..7ef4db9721a43bae8e0dbb5086d5f23d9c28cbb5 100644 (file)
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -44,27 +44,28 @@ volume.xml
 wave.xml
 fadein.xml
 fadeout.xml
-frei0r_colordistance.xml
-frei0r_squareblur.xml
-frei0r_distort0r.xml
 frei0r_balanc0r.xml
-frei0r_scale0tilt.xml
-frei0r_contrast0r.xml
 frei0r_brightness.xml
-frei0r_lenscorrection.xml
-frei0r_saturat0r.xml
-frei0r_vertigo.xml
+frei0r_coloradj_rgb.xml
+frei0r_colordistance.xml
+frei0r_contrast0r.xml
+frei0r_c0rners.xml
 frei0r_curves.xml
+frei0r_defish0r.xml
+frei0r_distort0r.xml
+frei0r_glow.xml
+frei0r_hueshift0r.xml
+frei0r_lenscorrection.xml
 frei0r_levels.xml
+frei0r_pixeliz0r.xml
+frei0r_saturat0r.xml
+frei0r_scale0tilt.xml
+frei0r_sopsat.xml
+frei0r_squareblur.xml
 frei0r_three_point_balance.xml
 frei0r_tint0r.xml
 frei0r_threshold0r.xml
-frei0r_c0rners.xml
-frei0r_defish0r.xml
-frei0r_glow.xml
-frei0r_pixeliz0r.xml
-frei0r_hueshift0r.xml
-frei0r_coloradj_rgb.xml
+frei0r_vertigo.xml
 gain.xml
 fade_from_black.xml
 fade_to_black.xml

diff --git a/effects/README b/effects/README
index e3f337b491c48da60d20b41695951f8b564e4035..89b83271615827f97983d4f8ad66578e1438a4c9 100644 (file)
--- a/effects/README
+++ b/effects/README
@@ -51,5 +51,6 @@ The parameter entry has the following attributes:
 
 The "name" tag gives the parameter name as it will appear to the user
 
-Kdenlive parses the effect folder at each startup, so that if you have an xml file describing a new effect, just copy it in your ~/.kde/share/apps/kdenlive/effects/ folder and restart Kdenlive to enable the new effect
+Kdenlive parses the effect folder at each startup, so that if you have an xml file describing a new effect, just copy it in your ~/.kde/share/apps/kdenlive/effects/ folder and restart Kdenlive to enable the new effect.
 
+Effects need to be blacklisted in the file kdenlive/data/blacklisted_effects.txt if they use a custom (i.e. non-default) XML GUI from this directory.
\ No newline at end of file

diff --git a/effects/frei0r_sopsat.xml b/effects/frei0r_sopsat.xml
new file mode 100644 (file)
index 0000000..130e661
--- /dev/null
+++ b/effects/frei0r_sopsat.xml
@@ -0,0 +1,49 @@
+<!DOCTYPE kpartgui>
+<effect tag="frei0r.sopsat" id="frei0r.sopsat">
+        <name>SOP/Sat</name>
+        <description>Changes Slope, Offset, and Power of the color components, and the overall Saturation, according to the ASC CDL (Color Decision List).</description>
+        <author>Simon A. Eugster (Granjow)</author>
+        <parameter type="constant" name="rSlope" default="100" min="0" max="1000" factor="100">
+                <name>Slope Red</name>
+        </parameter>
+        <parameter type="constant" name="gSlope" default="100" min="0" max="1000" factor="100">
+                <name>Slope Green</name>
+        </parameter>
+        <parameter type="constant" name="bSlope" default="100" min="0" max="1000" factor="100">
+                <name>Slope Blue</name>
+        </parameter>
+        <parameter type="constant" name="aSlope" default="100" min="0" max="1000" factor="100">
+                <name>Slope Alpha</name>
+        </parameter>
+
+        <parameter type="constant" name="rOffset" default="0" min="-1024" max="1024" factor="256">
+                <name>Offset Red</name>
+        </parameter>
+        <parameter type="constant" name="gOffset" default="0" min="-1024" max="1024" factor="256">
+                <name>Offset Green</name>
+        </parameter>
+        <parameter type="constant" name="bOffset" default="0" min="-1024" max="1024" factor="256">
+                <name>Offset Blue</name>
+        </parameter>
+        <parameter type="constant" name="aOffset" default="0" min="-1024" max="1024" factor="256">
+                <name>Offset Alpha</name>
+        </parameter>
+
+        <parameter type="constant" name="rPower" default="100" min="1" max="1000" factor="100">
+                <name>Power (Gamma) Red</name>
+        </parameter>
+        <parameter type="constant" name="gPower" default="100" min="1" max="1000" factor="100">
+                <name>Power (Gamma) Green</name>
+        </parameter>
+        <parameter type="constant" name="bPower" default="100" min="1" max="1000" factor="100">
+                <name>Power (Gamma) Blue</name>
+        </parameter>
+        <parameter type="constant" name="aPower" default="100" min="1" max="1000" factor="100">
+                <name>Power (Gamma) Alpha</name>
+        </parameter>
+
+        <parameter type="constant" name="saturation" default="100" min="0" max="500" factor="100">
+                <name>Overall Saturation</name>
+        </parameter>
+
+</effect>