diff options
| author | Lionel Landwerlin <llandwerlin@gmail.com> | 2014-09-16 03:12:42 +0100 |
|---|---|---|
| committer | Lionel Landwerlin <llandwerlin@gmail.com> | 2014-12-06 21:57:46 +0000 |
| commit | 47ad365b2857da5b988b058d865ba1d6c273f654 (patch) | |
| tree | ae03fb6412e548f0b3b6773d67148a07017e3ce4 | |
| parent | b9de8d411b15c54369401ffe2db2e1fdb3d5f07d (diff) | |
| download | clutter-gst-47ad365b2857da5b988b058d865ba1d6c273f654.tar.gz | |
content: rename video-sink property to sink
| -rw-r--r-- | clutter-gst/clutter-gst-content.c | 14 | ||||
| -rw-r--r-- | tests/test-alpha.c | 2 | ||||
| -rw-r--r-- | tests/test-rgb-upload.c | 2 | ||||
| -rw-r--r-- | 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), |