Color values in MLT should always contain alpha (0xRRGGBBAA):

http://kdenlive.org/mantis/view.php?id=2644

diff --git a/effects/chroma.xml b/effects/chroma.xml
index 91478d2cca322296812344c3178fb7d3203923b7..128a4cb0df14d18d5791c88d7e194293dae853bd 100644 (file)
--- a/effects/chroma.xml
+++ b/effects/chroma.xml
@@ -3,7 +3,7 @@
        <name>Blue Screen</name>
        <description>Make selected color transparent</description>
        <author>Charles Yates</author>
-       <parameter type="color" name="key" default="0x0000FF">
+       <parameter type="color" name="key" default="0x0000ffff">
                <name>Color key</name>
        </parameter>
        <parameter type="constant" name="variance" max="100" min="0" factor="100" default="15">

diff --git a/effects/chroma_hold.xml b/effects/chroma_hold.xml
index b31a5890e5ea32d06e2b140b3975c40f37fab5ee..ce6feffb1c015ab60c1dd61046b454a4efbc5ced 100644 (file)
--- a/effects/chroma_hold.xml
+++ b/effects/chroma_hold.xml
@@ -3,7 +3,7 @@
        <name>Chroma Hold</name>
        <description>Make image greyscale except for chosen color</description>
        <author>Charles Yates</author>
-       <parameter type="color" name="key" default="0x000000">
+       <parameter type="color" name="key" default="0x000000ff">
                <name>Color key</name>
        </parameter>
        <parameter type="constant" name="variance" max="100" min="0" factor="100" default="15" >

diff --git a/effects/frei0r_balanc0r.xml b/effects/frei0r_balanc0r.xml
index 6a5321601449355587f397d219d14e1fb9c19815..f7c55dc9cd4b5d3b5d39365b8f1536645f6461ed 100644 (file)
--- a/effects/frei0r_balanc0r.xml
+++ b/effects/frei0r_balanc0r.xml
@@ -4,7 +4,7 @@
        <name>White Balance</name>
        <description>Adjust the white balance / color temperature</description>
        <author>Dan Dennedy</author>
-       <parameter type="color" name="Neutral Color" default="0xFFFFFF">
+       <parameter type="color" name="Neutral Color" default="0xffffffff">
                <name>Neutral Color</name>
        </parameter>
         <parameter type="simplekeyframe" name="Green Tint" default="1200" min="0" max="2500" factor="1000">
@@ -15,7 +15,7 @@
        <name>White Balance</name>
        <description>Adjust the white balance / color temperature</description>
        <author>Dan Dennedy</author>
-       <parameter type="color" name="Neutral Color" default="0xFFFFFF">
+       <parameter type="color" name="Neutral Color" default="0xffffffff">
                <name>Neutral Color</name>
        </parameter>
         <parameter type="simplekeyframe" name="Green Tint" default="1333" min="0" max="10000" factor="10000">

diff --git a/effects/frei0r_colordistance.xml b/effects/frei0r_colordistance.xml
index 9f1836a8119246b483308616da1d651bcb0bf3fe..d407589b7382e6dab9fd91fffdb136dec585a998 100644 (file)
--- a/effects/frei0r_colordistance.xml
+++ b/effects/frei0r_colordistance.xml
@@ -3,7 +3,7 @@
        <name>Color Distance</name>
        <description>Calculates the distance between the selected color and the current pixel and uses that value as new pixel value</description>
        <author>Richard Spindler</author>
-       <parameter type="color" name="Color" default="0x000000">
+       <parameter type="color" name="Color" default="0x000000ff">
                <name>Source Color</name>
        </parameter>
 </effect>

diff --git a/effects/frei0r_keyspillm0pup.xml b/effects/frei0r_keyspillm0pup.xml
index f6eb1b68886991c20c26627f63e1cdafc3cdc045..3ca32b307c257870f85b0043fe4fbd1acdbae16d 100644 (file)
--- a/effects/frei0r_keyspillm0pup.xml
+++ b/effects/frei0r_keyspillm0pup.xml
@@ -4,11 +4,11 @@
     <description>Reduces the visibility of key color spill in chroma keying</description>
     <author>Marko Cebokli</author>
     
-    <parameter type="color" name="Key color" default="0x1010D0">
+    <parameter type="color" name="Key color" default="0x1010D0ff">
         <name>Key color</name>
     </parameter>
     
-    <parameter type="color" name="Target color" default="0xC87F65">
+    <parameter type="color" name="Target color" default="0xC87F65ff">
         <name>Target color</name>
     </parameter>
 

diff --git a/effects/frei0r_select0r.xml b/effects/frei0r_select0r.xml
index 021f21ce6c5f9f18eb366a92147d10a4c1f356b3..dba7c10a48c249f910cba94303b8cf5d29733373 100644 (file)
--- a/effects/frei0r_select0r.xml
+++ b/effects/frei0r_select0r.xml
@@ -5,7 +5,7 @@
             <description>Color based alpha selection</description>
             <author>Marko Cebokli</author>
         
-            <parameter type="color" name="Color to select" default="0x00FF00">
+            <parameter type="color" name="Color to select" default="0x00ff00ff">
                     <name>Color to select</name>
             </parameter>
         
@@ -52,7 +52,7 @@
             <description>Color based alpha selection</description>
             <author>Marko Cebokli</author>
         
-            <parameter type="color" name="Color to select" default="0x00FF00">
+            <parameter type="color" name="Color to select" default="0x00ff00ff">
                     <name>Color to select</name>
             </parameter>
         

diff --git a/effects/frei0r_three_point_balance.xml b/effects/frei0r_three_point_balance.xml
index becee0813a5b16488041fa1c0df0b5f904a0dd56..03b042cc79262baf37820f4d3d6af216f5d62138 100644 (file)
--- a/effects/frei0r_three_point_balance.xml
+++ b/effects/frei0r_three_point_balance.xml
@@ -3,13 +3,13 @@
        <name>3 point balance</name>
        <description>Balances colors along with 3 points</description>
        <author>Maksim Golovkin</author>
-       <parameter type="color" name="Black color" default="0x000000">
+       <parameter type="color" name="Black color" default="0x000000ff">
                <name>Black color</name>
        </parameter>
-       <parameter type="color" name="Gray color" default="0x808080">
+       <parameter type="color" name="Gray color" default="0x808080ff">
                <name>Gray color</name>
        </parameter>
-       <parameter type="color" name="White color" default="0xFFFFFF">
+       <parameter type="color" name="White color" default="0xffffffff">
                <name>White color</name>
        </parameter>
        <parameter type="bool" name="Split preview" default="0">

diff --git a/effects/frei0r_timeout.xml b/effects/frei0r_timeout.xml
index 27edfcfd0a048b31bd1aa1c6c6c0c43cd0ff452d..3b16833718cbdc323936d392e8142926c56228f5 100644 (file)
--- a/effects/frei0r_timeout.xml
+++ b/effects/frei0r_timeout.xml
@@ -3,7 +3,7 @@
     <effect tag="frei0r.timeout" id="frei0r.timeout">
        <name>Timeout indicator</name>
        <author>Simon A. Eugster (Granjow)</author>
-       <parameter type="color" name="color" default="0x6893C8">
+       <parameter type="color" name="color" default="0x6893C8ff">
                <name>Indicator color</name>
        </parameter>
         <parameter type="simplekeyframe" name="time" default="0" min="0" max="1000" factor="1000">

diff --git a/effects/frei0r_tint0r.xml b/effects/frei0r_tint0r.xml
index d79cd5e85cf9e8aa16ed7f0a992c87dc8a3f95d9..102a3cc7bfb70f95e07ca6f8913b99909d5f2228 100644 (file)
--- a/effects/frei0r_tint0r.xml
+++ b/effects/frei0r_tint0r.xml
@@ -3,10 +3,10 @@
        <name>Tint</name>
        <description>Maps source image luminance between two colors specified</description>
        <author>Maksim Golovkin</author>
-       <parameter type="color" name="Map black to" default="0x000000">
+       <parameter type="color" name="Map black to" default="0x000000ff">
                <name>Map black to</name>
        </parameter>
-       <parameter type="color" name="Map white to" default="0x80FF80">
+       <parameter type="color" name="Map white to" default="0x80FF80ff">
                <name>Map white to</name>
        </parameter>
        <parameter type="simplekeyframe" name="Tint amount" default="250" min="0" max="1000" factor="1000">

diff --git a/effects/pan_zoom.xml b/effects/pan_zoom.xml
index 89ccf76754852399f3891eda0fcaf37e25c2e081..3f5544a0e85e50ce901770a08b75f41ffa0fd81c 100644 (file)
--- a/effects/pan_zoom.xml
+++ b/effects/pan_zoom.xml
@@ -9,7 +9,7 @@
         <parameter type="bool" name="transition.distort" default="0">
                 <name>Distort</name>
         </parameter>
-       <parameter type="color" name="background" default="colour:0x00000000" paramprefix="colour:">
+       <parameter type="color" name="background" default="colour:0x00000000" alpha="1" paramprefix="colour:">
                <name>Background Color</name>
        </parameter>
 </effect>

diff --git a/effects/rotation.xml b/effects/rotation.xml
index 0130102b6665ae23c53d6d5f0e166c83415c642f..1a8a8ec27e6ccce7d461b3a322ffb59564a30170 100644 (file)
--- a/effects/rotation.xml
+++ b/effects/rotation.xml
@@ -36,7 +36,7 @@
        <parameter type="geometry" name="transition.geometry" default="0%,0%:100%x100%" fixed="1" opacity="false">
                <name>Pan and Zoom</name>
        </parameter>
-       <parameter type="color" name="background" default="colour:0x00000000" paramprefix="colour:">
+       <parameter type="color" name="background" default="colour:0x00000000" alpha="1" paramprefix="colour:">
                <name>Background Color</name>
        </parameter>
 </effect>

diff --git a/effects/rotation_keyframable.xml b/effects/rotation_keyframable.xml
index d78b14f9f45ffd23d81ee06785b15a98273e02ed..e4a8839526c5a3b18f3764c92002c61988ab0f1c 100644 (file)
--- a/effects/rotation_keyframable.xml
+++ b/effects/rotation_keyframable.xml
@@ -18,7 +18,7 @@
         <parameter type="simplekeyframe" name="transition.oy" max="32000" min="-32000" default="0">
                 <name>Offset Y</name>
         </parameter>
-       <parameter type="color" name="background" default="colour:0x00000000" paramprefix="colour:">
+       <parameter type="color" name="background" default="colour:0x00000000" alpha="1" paramprefix="colour:">
                <name>Background Color</name>
        </parameter>
         <parameter type="fixed" name="transition.keyed" max="1" min="1" default="1" />

diff --git a/src/choosecolorwidget.cpp b/src/choosecolorwidget.cpp
index 26c18743e649ab9455c58669647ca5da7a496738..8543d79ec3fb99d581145ea7a754ebd1743a2ef0 100644 (file)
--- a/src/choosecolorwidget.cpp
+++ b/src/choosecolorwidget.cpp
@@ -27,6 +27,7 @@
 #include <KColorButton>
 #include <KLocalizedString>
 #include <kdeversion.h>
+#include <KDebug>
 
 static QColor stringToColor(QString strColor)
 {
@@ -81,10 +82,14 @@ static QString colorToString(QColor color, bool alpha)
     {
         stream << color.alpha();
     }
+    else {
+       // MLT always wants 0xRRGGBBAA format
+       stream << "ff";
+    }
     return colorStr;
 }
 
-ChooseColorWidget::ChooseColorWidget(QString text, QString color, QWidget *parent) :
+ChooseColorWidget::ChooseColorWidget(QString text, QString color, bool alphaEnabled, QWidget *parent) :
         QWidget(parent)
 {
     QHBoxLayout *layout = new QHBoxLayout(this);
@@ -99,6 +104,9 @@ ChooseColorWidget::ChooseColorWidget(QString text, QString color, QWidget *paren
     rightSideLayout->setSpacing(0);
 
     m_button = new KColorButton(stringToColor(color), rightSide);
+#if KDE_IS_VERSION(4,5,0)
+    if (alphaEnabled) m_button->setAlphaChannelEnabled(alphaEnabled);
+#endif
 //     m_button->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
     ColorPickerWidget *picker = new ColorPickerWidget(rightSide);
 
@@ -121,13 +129,6 @@ QString ChooseColorWidget::getColor()
     return colorToString(m_button->color(), alphaChannel);
 }
 
-void ChooseColorWidget::setAlphaChannelEnabled(bool enabled)
-{
-#if KDE_IS_VERSION(4,5,0)
-    m_button->setAlphaChannelEnabled(enabled);
-#endif
-}
-
 void ChooseColorWidget::setColor(QColor color)
 {
     m_button->setColor(color);

diff --git a/src/choosecolorwidget.h b/src/choosecolorwidget.h
index 4c2c2ff2bb46246043e7b3e57457d0b4c8438687..3f4179488a0f2116c6ffcec76f97d010aebf9145 100644 (file)
--- a/src/choosecolorwidget.h
+++ b/src/choosecolorwidget.h
@@ -38,14 +38,12 @@ class ChooseColorWidget : public QWidget
 public:
     /** @brief Sets up the widget.
     * @param text (optional) What the color will be used for
-    * @param color (optional) initial color */
-    ChooseColorWidget(QString text = QString(), QString color = "0xffffffff", QWidget* parent = 0);
+    * @param color (optional) initial color 
+    * @param alphaEnabled (optional) Should transparent colors be enabled */
+    ChooseColorWidget(QString text = QString(), QString color = "0xffffffff", bool alphaEnabled = false, QWidget* parent = 0);
 
     /** @brief Gets the choosen color. */
     QString getColor();
-    /** @brief Enable the use of alpha channel.
-    * @param enabled (required) whether alpha is enabled or disabled */
-    void setAlphaChannelEnabled(bool enabled);
 
 private:
     KColorButton *m_button;

diff --git a/src/effectstack/parametercontainer.cpp b/src/effectstack/parametercontainer.cpp
index 0fd2da73b03125dcf948d5f96cdb0e36050886e2..9e5ecbdc8db7192307584c7e566b514f68e434b5 100644 (file)
--- a/src/effectstack/parametercontainer.cpp
+++ b/src/effectstack/parametercontainer.cpp
@@ -269,8 +269,7 @@ ParameterContainer::ParameterContainer(QDomElement effect, ItemInfo info, Effect
            if (pa.hasAttribute("paramprefix")) value.remove(0, pa.attribute("paramprefix").size());
             if (value.startsWith('#'))
                 value = value.replace('#', "0x");
-            ChooseColorWidget *choosecolor = new ChooseColorWidget(paramName, value, parent);
-           choosecolor->setAlphaChannelEnabled(true);
+            ChooseColorWidget *choosecolor = new ChooseColorWidget(paramName, value, pa.hasAttribute("alpha"), parent);
             m_vbox->addWidget(choosecolor);
             m_valueItems[paramName] = choosecolor;
             connect(choosecolor, SIGNAL(displayMessage(const QString&, int)), this, SIGNAL(displayMessage(const QString&, int)));