]> git.0d.be Git - empathy.git/commitdiff
Use funnel instead of fsfunnel for gstreamer 1.0
authorSjoerd Simons <sjoerd@luon.net>
Thu, 20 Sep 2012 08:26:44 +0000 (10:26 +0200)
committerSjoerd Simons <sjoerd@luon.net>
Thu, 20 Sep 2012 08:27:15 +0000 (10:27 +0200)
src/empathy-call-window.c

index db7605bfe358f28f5f365f9f3d8adfdefcaad7ca..cf22dadf0acb6ffe4ed0839a188fe0d2308c0e12 100644 (file)
@@ -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");