[farsight2/master] Pass the pad name to the _new_ghost_pad function (not the direction..)
Olivier Crête
olivier.crete at collabora.co.uk
Tue Dec 23 15:20:14 PST 2008
---
gst/fsrtpconference/fs-rtp-session.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 4319538..e3d6bf3 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -1668,13 +1668,14 @@ _create_codec_bin (CodecBlueprint *blueprint, const FsCodec *codec,
if (g_list_first (pipeline_factory) == walk)
/* if its the first element of the codec bin */
- if (!_create_ghost_pad (current_element, direction_str,
- codec_bin, error))
+ if (!_create_ghost_pad (current_element,
+ is_send ? "src" : "sink", codec_bin, error))
goto error;
if (g_list_next (g_list_first (pipeline_factory)) == NULL)
/* if its the last element of the codec bin */
- if (!_create_ghost_pad (current_element, direction_str, codec_bin, error))
+ if (!_create_ghost_pad (current_element,
+ is_send ? "sink" : "src" , codec_bin, error))
goto error;
@@ -2067,7 +2068,6 @@ fs_rtp_session_verify_send_codec_bin_locked (FsRtpSession *self, GError **error)
GstElement *codecbin = NULL;
gboolean ret = FALSE;
- FS_RTP_SESSION_LOCK (self);
codec = fs_rtp_session_select_send_codec_locked(self, &blueprint, error);
if (!codec)
@@ -2115,9 +2115,8 @@ fs_rtp_session_verify_send_codec_bin_locked (FsRtpSession *self, GError **error)
}
ret = TRUE;
- done:
- FS_RTP_SESSION_UNLOCK (self);
+ done:
return ret;
}
--
1.5.6.5
More information about the farsight-commits
mailing list