diff options
Diffstat (limited to 'src/empathy-call-window.c')
| -rw-r--r-- | src/empathy-call-window.c | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index c54c4dfd8..077cbe312 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -2818,11 +2818,7 @@ 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) { @@ -2862,11 +2858,7 @@ 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"); @@ -3347,7 +3339,6 @@ empathy_call_window_check_video_cb (gpointer data) } /* Called from the streaming thread */ -#ifdef HAVE_GST1 static GstPadProbeReturn empathy_call_window_video_probe_cb (GstPad *pad, GstPadProbeInfo *info, @@ -3367,29 +3358,6 @@ empathy_call_window_video_probe_cb (GstPad *pad, return GST_PAD_PROBE_OK; } -#else -static gboolean -empathy_call_window_video_probe_cb (GstPad *pad, - GstMiniObject *mini_obj, - EmpathyCallWindow *self) -{ - /* Ignore events */ - if (GST_IS_EVENT (mini_obj)) - return TRUE; - - if (G_UNLIKELY (!self->priv->got_video)) - { - /* show the remote video */ - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, - empathy_call_window_show_video_output_cb, - g_object_ref (self), g_object_unref); - - self->priv->got_video = TRUE; - } - - return TRUE; -} -#endif /* Called from the streaming thread */ static gboolean @@ -3416,14 +3384,10 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler, g_idle_add (empathy_call_window_show_video_output_cb, self); pad = empathy_call_window_get_video_sink_pad (self); -#ifdef HAVE_GST1 gst_pad_add_probe (src, GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_BUFFER_LIST, empathy_call_window_video_probe_cb, self, NULL); -#else - gst_pad_add_data_probe (src, - G_CALLBACK (empathy_call_window_video_probe_cb), self); -#endif + if (priv->got_video_src > 0) g_source_remove (priv->got_video_src); priv->got_video_src = g_timeout_add_seconds (1, @@ -3602,11 +3566,7 @@ empathy_call_window_content_added_cb (EmpathyCallHandler *handler, case FS_MEDIA_TYPE_VIDEO: if (priv->video_tee != NULL) { -#ifdef HAVE_GST1 pad = gst_element_get_request_pad (priv->video_tee, "src_%u"); -#else - pad = gst_element_get_request_pad (priv->video_tee, "src%d"); -#endif if (GST_PAD_LINK_FAILED (gst_pad_link (pad, sink))) { g_warning ("Could not link video source input pipeline"); |