[farsight2/master] Put argument of fs_rtp_session_negotiate_codecs in a more logical order

[Olivier Crête]

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

diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index c8b535c..949cede 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -1519,10 +1519,13 @@ fs_rtp_session_invalidate_pt (FsRtpSession *session, gint pt,
 /**
  * fs_rtp_session_negotiate_codecs:
  * @session: a #FsRtpSession
- * @remote_codecs: a #GList of #FsCodec
+ * @stream: The #FsRtpStream to which the new remote codecs belong
+ * @remote_codecs: The #GList of remote codecs to use for that stream
  *
  * Negotiates the codecs using the current (stored) codecs
- * and the new remote codecs.
+ * and the remote codecs from each stream.
+ * If a stream is specified, it will use the specified remote codecs
+ * instead of the ones currently in the stream
  *
  * MT safe
  *
@@ -1531,8 +1534,8 @@ fs_rtp_session_invalidate_pt (FsRtpSession *session, gint pt,
 
 gboolean
 fs_rtp_session_negotiate_codecs (FsRtpSession *session,
-    GList *remote_codecs,
     gpointer stream,
+    GList *remote_codecs,
     GError **error)
 {
   gboolean has_many_streams = FALSE;
diff --git a/gst/fsrtpconference/fs-rtp-session.h b/gst/fsrtpconference/fs-rtp-session.h
index ce1ab88..cdde4bd 100644
--- a/gst/fsrtpconference/fs-rtp-session.h
+++ b/gst/fsrtpconference/fs-rtp-session.h
@@ -93,8 +93,8 @@ void fs_rtp_session_new_recv_pad (FsRtpSession *session, GstPad *new_pad,
   guint32 ssrc, guint pt);
 
 gboolean fs_rtp_session_negotiate_codecs (FsRtpSession *session,
-    GList *remote_codecs,
     gpointer stream,
+    GList *remote_codecs,
     GError **error);
 
 GstElement *fs_rtp_session_new_recv_codec_bin_locked (FsRtpSession *session,
diff --git a/gst/fsrtpconference/fs-rtp-stream.c b/gst/fsrtpconference/fs-rtp-stream.c
index 80bda5c..849fece 100644
--- a/gst/fsrtpconference/fs-rtp-stream.c
+++ b/gst/fsrtpconference/fs-rtp-stream.c
@@ -541,8 +541,8 @@ fs_rtp_stream_set_remote_codecs (FsStream *stream,
     }
   }
 
-  if (fs_rtp_session_negotiate_codecs (self->priv->session, remote_codecs,
-          stream, error)) {
+  if (fs_rtp_session_negotiate_codecs (self->priv->session, stream,
+          remote_codecs, error)) {
     if (self->remote_codecs)
       fs_codec_list_destroy (self->remote_codecs);
     self->remote_codecs = fs_codec_list_copy (remote_codecs);
-- 
1.5.6.5