[farsight2/master] rtp: Make the locking of fs_rtp_sub_stream_verify_codec clearer

[Olivier Crête]

---
 gst/fsrtpconference/fs-rtp-session.c   |    6 +++---
 gst/fsrtpconference/fs-rtp-stream.c    |    2 +-
 gst/fsrtpconference/fs-rtp-substream.c |    4 ++--
 gst/fsrtpconference/fs-rtp-substream.h |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 970e01f..82af141 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -2039,7 +2039,7 @@ fs_rtp_session_verify_recv_codecs_locked (FsRtpSession *session)
   for (item = g_list_first (session->priv->free_substreams);
        item;
        item = g_list_next (item))
-    fs_rtp_sub_stream_verify_codec (item->data);
+    fs_rtp_sub_stream_verify_codec_locked (item->data);
 
   for (item = g_list_first (session->priv->streams);
        item;
@@ -2050,7 +2050,7 @@ fs_rtp_session_verify_recv_codecs_locked (FsRtpSession *session)
     for (item2 = g_list_first (stream->substreams);
          item2;
          item2 = g_list_next (item2))
-      fs_rtp_sub_stream_verify_codec (item2->data);
+      fs_rtp_sub_stream_verify_codec_locked (item2->data);
 
   }
 }
@@ -2530,7 +2530,7 @@ fs_rtp_session_new_recv_pad (FsRtpSession *session, GstPad *new_pad,
   }
   else
   {
-    fs_rtp_sub_stream_verify_codec (substream);
+    fs_rtp_sub_stream_verify_codec_locked (substream);
     FS_RTP_SESSION_UNLOCK (session);
   }
 
diff --git a/gst/fsrtpconference/fs-rtp-stream.c b/gst/fsrtpconference/fs-rtp-stream.c
index fc9b0db..0262689 100644
--- a/gst/fsrtpconference/fs-rtp-stream.c
+++ b/gst/fsrtpconference/fs-rtp-stream.c
@@ -946,7 +946,7 @@ fs_rtp_stream_add_substream_unlock (FsRtpStream *stream,
   g_signal_connect (substream, "error",
                     G_CALLBACK (_substream_error), stream);
 
-  fs_rtp_sub_stream_verify_codec (substream);
+  fs_rtp_sub_stream_verify_codec_locked (substream);
 
   /* Only announce a pad if it has a codec attached to it */
   if (substream->codec)
diff --git a/gst/fsrtpconference/fs-rtp-substream.c b/gst/fsrtpconference/fs-rtp-substream.c
index e606783..eb2cdcf 100644
--- a/gst/fsrtpconference/fs-rtp-substream.c
+++ b/gst/fsrtpconference/fs-rtp-substream.c
@@ -1318,7 +1318,7 @@ fs_rtp_sub_stream_add_probe_locked (FsRtpSubStream *substream)
 }
 
 /**
- * fs_rtp_sub_stream_verify_codec:
+ * fs_rtp_sub_stream_verify_codec_locked:
  * @substream: A #FsRtpSubStream
  *
  * This function will start the process that invalidates the codec
@@ -1328,7 +1328,7 @@ fs_rtp_sub_stream_add_probe_locked (FsRtpSubStream *substream)
  */
 
 void
-fs_rtp_sub_stream_verify_codec (FsRtpSubStream *substream)
+fs_rtp_sub_stream_verify_codec_locked (FsRtpSubStream *substream)
 {
   GST_LOG ("Starting codec verification process for substream with"
       " SSRC:%x pt:%d", substream->ssrc, substream->pt);
diff --git a/gst/fsrtpconference/fs-rtp-substream.h b/gst/fsrtpconference/fs-rtp-substream.h
index 5bb9a79..082b149 100644
--- a/gst/fsrtpconference/fs-rtp-substream.h
+++ b/gst/fsrtpconference/fs-rtp-substream.h
@@ -102,7 +102,7 @@ gboolean fs_rtp_sub_stream_add_output_ghostpad_unlock (
     FsRtpSubStream *substream,
     GError **error);
 
-void fs_rtp_sub_stream_verify_codec (FsRtpSubStream *substream);
+void fs_rtp_sub_stream_verify_codec_locked (FsRtpSubStream *substream);
 
 
 G_END_DECLS
-- 
1.5.6.5