[Xfce4-commits] <parole:master> Only use colorkey with xv

[Sean Davis]

Updating branch refs/heads/master
         to 98b00eedc3a7418b241d6f839f9bf0bfd2dbca12 (commit)
       from 344fb9d567d09c174007e9e30d15a691412af6ea (commit)

commit 98b00eedc3a7418b241d6f839f9bf0bfd2dbca12
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sat Sep 14 09:51:31 2013 -0400

    Only use colorkey with xv

 src/gst/parole-gst.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index b72cf42..452621e 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -466,6 +466,7 @@ static void
 parole_gst_set_video_overlay (ParoleGst *gst)
 {
     GstElement *video_sink;
+    gboolean enable_xv;
     
     g_object_get (G_OBJECT (gst->priv->playbin),
                   "video-sink", &video_sink,
@@ -484,8 +485,14 @@ parole_gst_set_video_overlay (ParoleGst *gst)
 
 #if GTK_CHECK_VERSION(3,8,0)
 #else
-    g_object_set(video_sink, "autopaint-colorkey", FALSE,
-                             "colorkey", 0x080810, NULL);
+    g_object_get (G_OBJECT (gst->priv->conf),
+                             "enable-xv", &enable_xv,
+                             NULL);
+    if (enable_xv)
+    {
+        g_object_set(video_sink, "autopaint-colorkey", FALSE,
+                                 "colorkey", 0x080810, NULL);
+    }
 #endif
     
     gst_object_unref (video_sink);