diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2012-04-27 13:19:56 +0100 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2012-04-27 13:19:56 +0100 |
| commit | 9f89087ee96b9c9157e8f1ac2e4b7b98e0b0837d (patch) | |
| tree | c020057cc3db2ad09ebd161b6885972ed5413fb0 | |
| parent | 4d70293fc650bf9a6355c2d31701c766b9fee65b (diff) | |
| download | clutter-gst-9f89087ee96b9c9157e8f1ac2e4b7b98e0b0837d.tar.gz | |
Revert "Revert "Revert "video-texture: Use autocluttersink"""
This reverts commit 05f6f02cfed487323e294bc3adeb4a471f814d52.
| -rw-r--r-- | clutter-gst/clutter-gst-video-texture.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/clutter-gst/clutter-gst-video-texture.c b/clutter-gst/clutter-gst-video-texture.c index 321bf75..7b69c69 100644 --- a/clutter-gst/clutter-gst-video-texture.c +++ b/clutter-gst/clutter-gst-video-texture.c @@ -44,7 +44,6 @@ #include <glib.h> #include <gio/gio.h> -#include <gst/base/gstbasesink.h> #include <gst/video/video.h> #include "clutter-gst-debug.h" @@ -532,15 +531,6 @@ idle_cb (ClutterGstVideoTexture *video_texture, clutter_actor_queue_redraw (CLUTTER_ACTOR (video_texture)); } -static void -on_autocluttersink_element_added (GstBin *bin, - GstElement *element, - ClutterGstVideoTexture *data) -{ - if (GST_IS_BASE_SINK (element)) - g_object_set (G_OBJECT (element), "qos", TRUE, NULL); -} - static gboolean setup_pipeline (ClutterGstVideoTexture *video_texture) { @@ -554,14 +544,11 @@ setup_pipeline (ClutterGstVideoTexture *video_texture) return FALSE; } - video_sink = gst_element_factory_make ("autocluttersink", NULL); - g_signal_connect (video_sink, - "element-added", - G_CALLBACK (on_autocluttersink_element_added), - video_texture); + video_sink = gst_element_factory_make ("cluttersink", NULL); g_object_set (G_OBJECT (video_sink), "texture", CLUTTER_TEXTURE (video_texture), - NULL); + "qos", TRUE, + "sync", TRUE, NULL); g_object_set (G_OBJECT (pipeline), "video-sink", video_sink, "subtitle-font-desc", "Sans 16", |