diff options
author | Josep Torra <n770galaxy@gmail.com> | 2011-09-21 14:26:43 +0200 |
---|---|---|
committer | Damien Lespiau <damien.lespiau@intel.com> | 2011-11-02 17:52:39 +0000 |
commit | 7a7d7886cd7428e72c95d2411b5d2efd2505a90c (patch) | |
tree | 1c39099a2c603720b7ba60b6044fdf3a27d67fe9 | |
parent | 76d911db3b3e9ac8734b52dc41f83c1e528286a8 (diff) | |
download | clutter-gst-7a7d7886cd7428e72c95d2411b5d2efd2505a90c.tar.gz |
tests, examples: switch to new API to instantiate the videosink
Change the application related code to use the new preferred API to
create the sink.
-rw-r--r-- | clutter-gst/clutter-gst-video-texture.c | 8 | ||||
-rw-r--r-- | examples/video-sink-navigation.c | 3 | ||||
-rw-r--r-- | examples/video-sink.c | 3 | ||||
-rw-r--r-- | tests/test-alpha.c | 3 | ||||
-rw-r--r-- | tests/test-rgb-upload.c | 3 | ||||
-rw-r--r-- | tests/test-yuv-upload.c | 3 |
6 files changed, 15 insertions, 8 deletions
diff --git a/clutter-gst/clutter-gst-video-texture.c b/clutter-gst/clutter-gst-video-texture.c index bb38cef..7b69c69 100644 --- a/clutter-gst/clutter-gst-video-texture.c +++ b/clutter-gst/clutter-gst-video-texture.c @@ -51,7 +51,6 @@ #include "clutter-gst-marshal.h" #include "clutter-gst-player.h" #include "clutter-gst-private.h" -#include "clutter-gst-util.h" #include "clutter-gst-video-texture.h" struct _ClutterGstVideoTexturePrivate @@ -545,8 +544,11 @@ setup_pipeline (ClutterGstVideoTexture *video_texture) return FALSE; } - video_sink = clutter_gst_video_sink_new (CLUTTER_TEXTURE (video_texture)); - g_object_set (G_OBJECT (video_sink), "qos", TRUE, "sync", TRUE, NULL); + video_sink = gst_element_factory_make ("cluttersink", NULL); + g_object_set (G_OBJECT (video_sink), + "texture", CLUTTER_TEXTURE (video_texture), + "qos", TRUE, + "sync", TRUE, NULL); g_object_set (G_OBJECT (pipeline), "video-sink", video_sink, "subtitle-font-desc", "Sans 16", diff --git a/examples/video-sink-navigation.c b/examples/video-sink-navigation.c index 547cfc9..3f91ca3 100644 --- a/examples/video-sink-navigation.c +++ b/examples/video-sink-navigation.c @@ -118,7 +118,8 @@ main (int argc, char *argv[]) test = gst_element_factory_make ("navigationtest", NULL); colorspace = gst_element_factory_make ("ffmpegcolorspace", NULL); - sink = clutter_gst_video_sink_new (CLUTTER_TEXTURE (texture)); + sink = gst_element_factory_make ("cluttersink", NULL); + g_object_set (sink, "texture", CLUTTER_TEXTURE (texture), NULL); // g_object_set (src , "pattern", 10, NULL); diff --git a/examples/video-sink.c b/examples/video-sink.c index eb2389c..877f2d8 100644 --- a/examples/video-sink.c +++ b/examples/video-sink.c @@ -113,7 +113,8 @@ main (int argc, char *argv[]) src = gst_element_factory_make ("videotestsrc", NULL); warp = gst_element_factory_make ("warptv", NULL); colorspace = gst_element_factory_make ("ffmpegcolorspace", NULL); - sink = clutter_gst_video_sink_new (CLUTTER_TEXTURE (texture)); + sink = gst_element_factory_make ("cluttersink", NULL); + g_object_set (sink, "texture", CLUTTER_TEXTURE (texture), NULL); // g_object_set (src , "pattern", 10, NULL); diff --git a/tests/test-alpha.c b/tests/test-alpha.c index 693905c..79786c9 100644 --- a/tests/test-alpha.c +++ b/tests/test-alpha.c @@ -165,7 +165,8 @@ main (int argc, char *argv[]) src = gst_element_factory_make ("videotestsrc", NULL); g_object_set (G_OBJECT (src), "pattern", 1, NULL); capsfilter = gst_element_factory_make ("capsfilter", NULL); - sink = clutter_gst_video_sink_new (CLUTTER_TEXTURE (texture)); + sink = gst_element_factory_make ("cluttersink", NULL); + g_object_set (G_OBJECT (sink), "texture", CLUTTER_TEXTURE (texture), NULL); /* make videotestsrc spit the format we want */ if (g_strcmp0 (opt_fourcc, "RGB ") == 0) diff --git a/tests/test-rgb-upload.c b/tests/test-rgb-upload.c index f47c99b..57dde63 100644 --- a/tests/test-rgb-upload.c +++ b/tests/test-rgb-upload.c @@ -149,7 +149,8 @@ main (int argc, char *argv[]) src = gst_element_factory_make ("videotestsrc", NULL); capsfilter = gst_element_factory_make ("capsfilter", NULL); - sink = clutter_gst_video_sink_new (CLUTTER_TEXTURE (texture)); + sink = gst_element_factory_make ("cluttersink", NULL); + g_object_set (sink, "texture", CLUTTER_TEXTURE (texture), NULL); /* make videotestsrc spit the format we want */ caps = gst_caps_new_simple ("video/x-raw-rgb", diff --git a/tests/test-yuv-upload.c b/tests/test-yuv-upload.c index dc7a15a..ca1ff18 100644 --- a/tests/test-yuv-upload.c +++ b/tests/test-yuv-upload.c @@ -147,7 +147,8 @@ main (int argc, char *argv[]) src = gst_element_factory_make ("videotestsrc", NULL); capsfilter = gst_element_factory_make ("capsfilter", NULL); - sink = clutter_gst_video_sink_new (CLUTTER_TEXTURE (texture)); + sink = gst_element_factory_make ("cluttersink", NULL); + g_object_set (sink, "texture", CLUTTER_TEXTURE (texture), NULL); /* make videotestsrc spit the format we want */ caps = gst_caps_new_simple ("video/x-raw-yuv", |