aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-call-window.c
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@luon.net>2012-09-20 16:26:44 +0800
committerSjoerd Simons <sjoerd@luon.net>2012-09-20 16:27:15 +0800
commit86bd1377559de3de50681b0f82b4a439958b2870 (patch)
tree419d721ae7ae9c55fd977a7ef5bcf416bec2ed0f /src/empathy-call-window.c
parent0444944a1ba4a06f2d55fd02429e7f377a7c2264 (diff)
downloadgsoc2013-empathy-86bd1377559de3de50681b0f82b4a439958b2870.tar
gsoc2013-empathy-86bd1377559de3de50681b0f82b4a439958b2870.tar.gz
gsoc2013-empathy-86bd1377559de3de50681b0f82b4a439958b2870.tar.bz2
gsoc2013-empathy-86bd1377559de3de50681b0f82b4a439958b2870.tar.lz
gsoc2013-empathy-86bd1377559de3de50681b0f82b4a439958b2870.tar.xz
gsoc2013-empathy-86bd1377559de3de50681b0f82b4a439958b2870.tar.zst
gsoc2013-empathy-86bd1377559de3de50681b0f82b4a439958b2870.zip
Use funnel instead of fsfunnel for gstreamer 1.0
Diffstat (limited to 'src/empathy-call-window.c')
-rw-r--r--src/empathy-call-window.c12
1 files changed, 9 insertions, 3 deletions
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");