diff options
| author | Olivier Crête <olivier.crete@collabora.co.uk> | 2010-03-07 05:59:51 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-29 23:36:23 +0800 |
| commit | 6f2876c2a265e4dbd968113795ec222dec86d008 (patch) | |
| tree | 7bd7b4475bfcbcca5c8206749590bbb1968f0eae | |
| parent | 4a4a8f89579147d1e712d5da257c83786f86439f (diff) | |
| download | gsoc2013-empathy-6f2876c2a265e4dbd968113795ec222dec86d008.tar gsoc2013-empathy-6f2876c2a265e4dbd968113795ec222dec86d008.tar.gz gsoc2013-empathy-6f2876c2a265e4dbd968113795ec222dec86d008.tar.bz2 gsoc2013-empathy-6f2876c2a265e4dbd968113795ec222dec86d008.tar.lz gsoc2013-empathy-6f2876c2a265e4dbd968113795ec222dec86d008.tar.xz gsoc2013-empathy-6f2876c2a265e4dbd968113795ec222dec86d008.tar.zst gsoc2013-empathy-6f2876c2a265e4dbd968113795ec222dec86d008.zip | |
Emit error when failing to link audio pad
| -rw-r--r-- | src/empathy-call-window.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 09197bfe1..2c2fa6264 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -1999,6 +1999,7 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler, { EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data); EmpathyCallWindowPriv *priv = GET_PRIV (self); + gboolean retval = FALSE; GstPad *pad; @@ -2025,9 +2026,19 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler, g_assert_not_reached (); } - gst_pad_link (src, pad); + if (!pad) + goto out; + + if (GST_PAD_LINK_FAILED (gst_pad_link (src, pad))) + g_warning ("Could not link %s sink pad", + media_type == TP_MEDIA_STREAM_TYPE_AUDIO ? "audio" : "video"); + else + retval = TRUE; + gst_object_unref (pad); + out: + g_mutex_unlock (priv->lock); return TRUE; |