From 86bd1377559de3de50681b0f82b4a439958b2870 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Thu, 20 Sep 2012 10:26:44 +0200 Subject: Use funnel instead of fsfunnel for gstreamer 1.0 --- src/empathy-call-window.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/empathy-call-window.c') diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index db7605bfe..cf22dadf0 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -2734,12 +2734,15 @@ empathy_call_window_get_video_sink_pad (EmpathyCallWindow *self) if (priv->funnel == NULL) { output = priv->video_output_sink; - +#ifdef HAVE_GST1 + priv->funnel = gst_element_factory_make ("funnel", NULL); +#else priv->funnel = gst_element_factory_make ("fsfunnel", NULL); +#endif if (!priv->funnel) { - g_warning ("Could not create fsfunnel"); + g_warning ("Could not create video funnel"); return NULL; } @@ -2775,8 +2778,11 @@ empathy_call_window_get_video_sink_pad (EmpathyCallWindow *self) goto error_output_added; } } - +#ifdef HAVE_GST1 + pad = gst_element_get_request_pad (priv->funnel, "sink_%u"); +#else pad = gst_element_get_request_pad (priv->funnel, "sink%d"); +#endif if (!pad) g_warning ("Could not get request pad from funnel"); -- cgit v1.2.3