[clutter-gst] content: rename video-sink property to sink



commit 47ad365b2857da5b988b058d865ba1d6c273f654
Author: Lionel Landwerlin <llandwerlin gmail com>
Date:   Tue Sep 16 03:12:42 2014 +0100

    content: rename video-sink property to sink

 clutter-gst/clutter-gst-content.c |   14 +++++++-------
 tests/test-alpha.c                |    2 +-
 tests/test-rgb-upload.c           |    2 +-
 tests/test-yuv-upload.c           |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/clutter-gst/clutter-gst-content.c b/clutter-gst/clutter-gst-content.c
index 305414c..3c625c7 100644
--- a/clutter-gst/clutter-gst-content.c
+++ b/clutter-gst/clutter-gst-content.c
@@ -69,7 +69,7 @@ enum
 {
   PROP_0,
 
-  PROP_VIDEO_SINK,
+  PROP_SINK,
   PROP_PLAYER,
   PROP_PAINT_FRAME,
   PROP_PAINT_OVERLAYS,
@@ -278,7 +278,7 @@ content_set_sink (ClutterGstContent   *self,
         }
     }
 
-  g_object_notify (G_OBJECT (self), "video-sink");
+  g_object_notify (G_OBJECT (self), "sink");
 }
 
 static gboolean
@@ -414,7 +414,7 @@ clutter_gst_content_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_VIDEO_SINK:
+    case PROP_SINK:
       content_set_sink (self, g_value_get_object (value), FALSE);
       break;
 
@@ -447,7 +447,7 @@ clutter_gst_content_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_VIDEO_SINK:
+    case PROP_SINK:
       g_value_set_object (value, priv->sink);
       break;
 
@@ -512,8 +512,8 @@ clutter_gst_content_class_init (ClutterGstContentClass *klass)
                          G_TYPE_OBJECT,
                          G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
 
-  props[PROP_VIDEO_SINK] =
-    g_param_spec_object ("video-sink",
+  props[PROP_SINK] =
+    g_param_spec_object ("sink",
                          "Cogl Video Sink",
                          "Cogl Video Sink",
                          CLUTTER_GST_TYPE_VIDEO_SINK,
@@ -594,7 +594,7 @@ ClutterContent *
 clutter_gst_content_new_with_sink (ClutterGstVideoSink *sink)
 {
   return g_object_new (CLUTTER_GST_TYPE_CONTENT,
-                       "video-sink", sink,
+                       "sink", sink,
                        NULL);
 }
 
diff --git a/tests/test-alpha.c b/tests/test-alpha.c
index a73c7c8..a69439b 100644
--- a/tests/test-alpha.c
+++ b/tests/test-alpha.c
@@ -124,7 +124,7 @@ main (int argc, char *argv[])
   /* Video actor */
   actor = g_object_new (CLUTTER_TYPE_ACTOR,
                         "content", g_object_new (CLUTTER_GST_TYPE_CONTENT,
-                                                 "video-sink", sink,
+                                                 "sink", sink,
                                                  NULL),
                         "width", clutter_actor_get_width (stage),
                         "height", clutter_actor_get_height (stage),
diff --git a/tests/test-rgb-upload.c b/tests/test-rgb-upload.c
index aa8f202..0fc3e71 100644
--- a/tests/test-rgb-upload.c
+++ b/tests/test-rgb-upload.c
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
   /* Video actor */
   actor = g_object_new (CLUTTER_TYPE_ACTOR,
                         "content", g_object_new (CLUTTER_GST_TYPE_CONTENT,
-                                                 "video-sink", sink,
+                                                 "sink", sink,
                                                  NULL),
                         "width", clutter_actor_get_width (stage),
                         "height", clutter_actor_get_height (stage),
diff --git a/tests/test-yuv-upload.c b/tests/test-yuv-upload.c
index 347bcd0..a2f7f57 100644
--- a/tests/test-yuv-upload.c
+++ b/tests/test-yuv-upload.c
@@ -94,7 +94,7 @@ main (int argc, char *argv[])
   /* Video actor */
   actor = g_object_new (CLUTTER_TYPE_ACTOR,
                         "content", g_object_new (CLUTTER_GST_TYPE_CONTENT,
-                                                 "video-sink", sink,
+                                                 "sink", sink,
                                                  NULL),
                         "width", clutter_actor_get_width (stage),
                         "height", clutter_actor_get_height (stage),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]