[farsight2/master] Make the related functions private to the stream

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


---
 gst/fsrtpconference/fs-rtp-session.c |   64 +++++++++++++++++++---------------
 gst/fsrtpconference/fs-rtp-session.h |   10 -----
 2 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 63b988d..ff631fc 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -203,6 +203,14 @@ static FsStreamTransmitter *fs_rtp_session_get_new_stream_transmitter (
   GParameter *parameters,
   GError **error);
 
+static gboolean
+fs_rtp_session_substream_add_codec_bin (FsRtpSession *session,
+    gpointer ss,
+    guint32 ssrc,
+    guint pt,
+    GError **error);
+
+
 static void
 _remove_stream (gpointer user_data,
     GObject *where_the_object_was);
@@ -2048,7 +2056,7 @@ _create_codec_bin (CodecBlueprint *blueprint, const FsCodec *codec,
  * Returns: %TRUE on success, %FALSE on error
  */
 
-gboolean
+static gboolean
 fs_rtp_session_substream_add_codec_bin (FsRtpSession *session,
     gpointer ss,
     guint32 ssrc,
@@ -2466,6 +2474,33 @@ fs_rtp_session_verify_send_codec_bin_locked (FsRtpSession *self, GError **error)
   return TRUE;
 }
 
+/**
+ * fs_rtp_session_get_recv_codec_for_pt
+ *
+ * Gets the Codec from its PT from the codecs associations table
+ *
+ * Return: a copy of the #FsCodec or NULL
+ */
+static FsCodec *
+fs_rtp_session_get_recv_codec_for_pt (FsRtpSession *session,
+    gint pt)
+{
+  CodecAssociation *codec_association = NULL;
+  FsCodec *codec = NULL;
+
+  FS_RTP_SESSION_LOCK (session);
+
+  codec_association = lookup_codec_association_by_pt (
+      session->priv->negotiated_codec_associations, pt);
+
+  if (codec_association)
+    codec = fs_codec_copy (codec_association->codec);
+
+  FS_RTP_SESSION_UNLOCK (session);
+
+  return codec;
+}
+
 static void
 _substream_blocked (FsRtpSubStream *substream, FsRtpStream *stream,
     FsRtpSession *session)
@@ -2523,33 +2558,6 @@ _substream_blocked (FsRtpSubStream *substream, FsRtpStream *stream,
   g_clear_error (&error);
 }
 
-/**
- * fs_rtp_session_get_recv_codec_for_pt
- *
- * Gets the Codec from its PT from the codecs associations table
- *
- * Return: a copy of the #FsCodec or NULL
- */
-FsCodec *
-fs_rtp_session_get_recv_codec_for_pt (FsRtpSession *session,
-    gint pt)
-{
-  CodecAssociation *codec_association = NULL;
-  FsCodec *codec = NULL;
-
-  FS_RTP_SESSION_LOCK (session);
-
-  codec_association = lookup_codec_association_by_pt (
-      session->priv->negotiated_codec_associations, pt);
-
-  if (codec_association)
-    codec = fs_codec_copy (codec_association->codec);
-
-  FS_RTP_SESSION_UNLOCK (session);
-
-  return codec;
-}
-
 
 void
 fs_rtp_session_associate_ssrc_cname (FsRtpSession *session,
diff --git a/gst/fsrtpconference/fs-rtp-session.h b/gst/fsrtpconference/fs-rtp-session.h
index 6df3af0..1142800 100644
--- a/gst/fsrtpconference/fs-rtp-session.h
+++ b/gst/fsrtpconference/fs-rtp-session.h
@@ -92,9 +92,6 @@ GstCaps *fs_rtp_session_request_pt_map (FsRtpSession *session, guint pt);
 void fs_rtp_session_new_recv_pad (FsRtpSession *session, GstPad *new_pad,
   guint32 ssrc, guint pt);
 
-FsCodec *fs_rtp_session_get_recv_codec_for_pt (FsRtpSession *session,
-    gint pt);
-
 void fs_rtp_session_associate_ssrc_cname (FsRtpSession *session,
     guint32 ssrc,
     const gchar *cname);
@@ -102,13 +99,6 @@ void fs_rtp_session_associate_ssrc_cname (FsRtpSession *session,
 void fs_rtp_session_bye_ssrc (FsRtpSession *session,
     guint32 ssrc);
 
-gboolean
-fs_rtp_session_substream_add_codec_bin (FsRtpSession *session,
-    gpointer ss,
-    guint32 ssrc,
-    guint pt,
-    GError **error);
-
 
 G_END_DECLS
 
-- 
1.5.6.5




More information about the farsight-commits mailing list