[farsight2/master] Remove uses of negotiated_codecs in select_send_codec_locked

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:22:36 PST 2008


---
 gst/fsrtpconference/fs-rtp-session.c |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index cefb32d..7b63fca 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -2122,7 +2122,7 @@ fs_rtp_session_select_send_codec_locked (FsRtpSession *session,
   FsCodec *codec = NULL;
   GList *codec_e = NULL;
 
-  if (!session->priv->negotiated_codecs)
+  if (!session->priv->negotiated_codec_associations)
   {
     g_set_error (error, FS_ERROR, FS_ERROR_INTERNAL,
         "Tried to call fs_rtp_session_select_send_codec_bin before the codec"
@@ -2131,15 +2131,10 @@ fs_rtp_session_select_send_codec_locked (FsRtpSession *session,
   }
 
   if (session->priv->requested_send_codec) {
-    GList *elem = NULL;
 
-    for (elem = g_list_first (session->priv->negotiated_codecs);
-         elem;
-         elem = g_list_next (elem))
-      if (fs_codec_are_equal (elem->data, session->priv->requested_send_codec))
-        break;
-
-    if (elem)
+    if (lookup_codec_association_by_codec (
+            session->priv->negotiated_codec_associations,
+            session->priv->requested_send_codec))
     {
       if (!fs_rtp_session_is_valid_send_codec (session,
               session->priv->requested_send_codec, blueprint))
-- 
1.5.6.5




More information about the farsight-commits mailing list