[videosink] Remove the use-shaders property

This is an API change.

This property had been unused for a couple of months. Basically the use
of shaders depends on runtime detection.
For those who still do not want to use the colorspacing shaders, you can
use a capsfilter before the clutter sink to request RGB. See
tests/test-rgb-upload.c for an example of doing just that.

3 files changed, 0 insertions, 34 deletions

diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
index 4126a36..beca3bb 100644
--- a/clutter-gst/clutter-gst-video-sink.c
+++ b/clutter-gst/clutter-gst-video-sink.c
@@ -121,7 +121,6 @@ enum
 {
   PROP_0,
   PROP_TEXTURE,
-  PROP_USE_SHADERS,
 };
 
 typedef enum
@@ -197,7 +196,6 @@ struct _ClutterGstVideoSinkPrivate
   int                    height;
   int                    fps_n, fps_d;
   int                    par_n, par_d;
-  gboolean               use_shaders;
   gboolean               shaders_init;
   
   ClutterGstSymbols      syms;          /* extra OpenGL functions */
@@ -924,7 +922,6 @@ clutter_gst_video_sink_init (ClutterGstVideoSink      *sink,
                                  ClutterGstVideoSinkPrivate);
 
   priv->buffer_lock = g_mutex_new ();
-  priv->use_shaders = TRUE;
   priv->renderers = clutter_gst_build_renderers_list (&priv->syms);
   priv->caps = clutter_gst_build_caps (priv->renderers);
 
@@ -1133,7 +1130,6 @@ clutter_gst_video_sink_set_property (GObject *object,
 {
   ClutterGstVideoSink *sink;
   ClutterGstVideoSinkPrivate *priv;
-  gboolean use_shaders;
 
   sink = CLUTTER_GST_VIDEO_SINK (object);
   priv = sink->priv;
@@ -1146,14 +1142,6 @@ clutter_gst_video_sink_set_property (GObject *object,
 
       priv->texture = CLUTTER_TEXTURE (g_value_dup_object (value));
       break;
-    case PROP_USE_SHADERS:
-      use_shaders = g_value_get_boolean (value);
-      if (priv->use_shaders != use_shaders)
-        {
-          priv->use_shaders = use_shaders;
-          g_object_notify (object, "use-shaders");
-        }
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1175,9 +1163,6 @@ clutter_gst_video_sink_get_property (GObject *object,
     case PROP_TEXTURE:
       g_value_set_object (value, sink->priv->texture);
       break;
-    case PROP_USE_SHADERS:
-      g_value_set_boolean (value, sink->priv->use_shaders);
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1236,15 +1221,6 @@ clutter_gst_video_sink_class_init (ClutterGstVideoSinkClass *klass)
                                     "Target ClutterTexture object",
                                     CLUTTER_TYPE_TEXTURE,
                                     G_PARAM_READWRITE));
-
-  g_object_class_install_property 
-              (gobject_class, PROP_USE_SHADERS,
-               g_param_spec_boolean ("use-shaders",
-                                     "Use shaders",
-                                     "Use a fragment shader to accelerate "
-                                     "colour-space conversion.",
-                                     TRUE,
-                                     G_PARAM_READWRITE));
 }
 
 /**
diff --git a/examples/video-player.c b/examples/video-player.c
index 1cb685b..721014d 100644
--- a/examples/video-player.c
+++ b/examples/video-player.c
@@ -276,8 +276,6 @@ main (int argc, char *argv[])
   ClutterColor         stage_color = { 0x00, 0x00, 0x00, 0x00 };
   ClutterColor         control_color1 = { 73, 74, 77, 0xee };
   ClutterColor         control_color2 = { 0xcc, 0xcc, 0xcc, 0xff };
-  ClutterGstVideoSink *sink;
-  GstElement          *playbin;
   gfloat               x,y;
 
   if (argc < 2)
@@ -297,12 +295,6 @@ main (int argc, char *argv[])
   if (app->vtexture == NULL)
     g_error("failed to create vtexture");
 
-  /* Use shaders if they're available */
-  playbin = clutter_gst_video_texture_get_playbin (
-              CLUTTER_GST_VIDEO_TEXTURE (app->vtexture));
-  g_object_get (G_OBJECT (playbin), "video-sink", &sink, NULL);
-  g_object_set (G_OBJECT (sink), "use-shaders", TRUE, NULL);
-
   /* Dont let the underlying pixbuf dictate size */
   g_object_set (G_OBJECT(app->vtexture), "sync-size", FALSE, NULL);
 
diff --git a/tests/test-rgb-upload.c b/tests/test-rgb-upload.c
index a91a307..ba20b5d 100644
--- a/tests/test-rgb-upload.c
+++ b/tests/test-rgb-upload.c
@@ -142,8 +142,6 @@ main (int argc, char *argv[])
   capsfilter = gst_element_factory_make ("capsfilter", NULL);
   sink = clutter_gst_video_sink_new (CLUTTER_TEXTURE (texture));
 
-  g_object_set (G_OBJECT (sink), "use-shaders", FALSE, NULL);
-
   /* make videotestsrc spit the format we want */
   caps = gst_caps_new_simple ("video/x-raw-rgb",
                               "bpp", G_TYPE_INT, opt_bpp,