[clutter-gst] tests, examples: switch to new API to instantiate the videosink



commit 7a7d7886cd7428e72c95d2411b5d2efd2505a90c
Author: Josep Torra <n770galaxy gmail com>
Date:   Wed Sep 21 14:26:43 2011 +0200

    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.

 clutter-gst/clutter-gst-video-texture.c |    8 +++++---
 examples/video-sink-navigation.c        |    3 ++-
 examples/video-sink.c                   |    3 ++-
 tests/test-alpha.c                      |    3 ++-
 tests/test-rgb-upload.c                 |    3 ++-
 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",



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