summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2012-03-07 13:23:34 +0000
committerDamien Lespiau <damien.lespiau@intel.com>2012-03-07 13:23:34 +0000
commitb96101a3ec2641d7f014934006e04d5aa36eea31 (patch)
tree4e9e3231eb7cafa5a59b90665b1e61078b3f6bf6
parent8197f6f974cf57709aded7218c72911f5e753fd7 (diff)
downloadclutter-gst-b96101a3ec2641d7f014934006e04d5aa36eea31.tar.gz
Revert "video-texture: Use autocluttersink"
This reverts commit 6b96154a5e89b8578817af8cfec6532ef35b870f. This discussion in https://bugzilla.gnome.org/show_bug.cgi?id=671478
-rw-r--r--clutter-gst/clutter-gst-video-texture.c19
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",