[farsight2/master] Make it clear that the parameters for new stream are for the stream transmitter

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


---
 gst-libs/gst/farsight/fs-session.c |   12 ++++++++----
 gst-libs/gst/farsight/fs-session.h |    8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/gst-libs/gst/farsight/fs-session.c b/gst-libs/gst/farsight/fs-session.c
index b96007e..6ed37e3 100644
--- a/gst-libs/gst/farsight/fs-session.c
+++ b/gst-libs/gst/farsight/fs-session.c
@@ -407,8 +407,10 @@ _remove_stream_ptr (FsSession *session, FsStream *stream)
  * @direction: #FsStreamDirection describing the direction of the new stream that will
  * be created for this participant
  * @transmitter: Name of the type of transmitter to use for this session
- * @n_parameters: Number of parametrs passed to the stream transmitter
- * @parameters: an array of n_parameters #GParameter struct that will be passed
+ * @stream_transmitter_n_parameters: Number of parametrs passed to the stream
+ *  transmitter
+ * @stream_transmitter_parameters: an array of n_parameters #GParameter struct
+ *  that will be passed
  *   to the newly-create #FsStreamTransmitter
  * @error: location of a #GError, or NULL if no error occured
  *
@@ -420,7 +422,8 @@ _remove_stream_ptr (FsSession *session, FsStream *stream)
 FsStream *
 fs_session_new_stream (FsSession *session, FsParticipant *participant,
                        FsStreamDirection direction, gchar *transmitter,
-                       guint n_parameters, GParameter *parameters,
+                       guint stream_transmitter_n_parameters,
+                       GParameter *stream_transmitter_parameters,
                        GError **error)
 {
   FsSessionClass *klass = FS_SESSION_GET_CLASS (session);
@@ -430,7 +433,8 @@ fs_session_new_stream (FsSession *session, FsParticipant *participant,
 
   if (klass->new_stream) {
     new_stream = klass->new_stream (session, participant, direction,
-      transmitter, n_parameters, parameters, error);
+      transmitter, stream_transmitter_n_parameters,
+      stream_transmitter_parameters, error);
 
     if (!new_stream)
       return NULL;
diff --git a/gst-libs/gst/farsight/fs-session.h b/gst-libs/gst/farsight/fs-session.h
index 628b6a7..498096b 100644
--- a/gst-libs/gst/farsight/fs-session.h
+++ b/gst-libs/gst/farsight/fs-session.h
@@ -120,8 +120,8 @@ struct _FsSessionClass
                             FsParticipant *participant,
                             FsStreamDirection direction,
                             gchar *transmitter,
-                            guint n_parameters,
-                            GParameter *parameters,
+                            guint stream_transmitter_n_parameters,
+                            GParameter *stream_transmitter_parameters,
                             GError **error);
 
   gboolean (* start_telephony_event) (FsSession *session, guint8 event,
@@ -157,8 +157,8 @@ FsStream *fs_session_new_stream (FsSession *session,
                                  FsParticipant *participant,
                                  FsStreamDirection direction,
                                  gchar *transmitter,
-                                 guint n_parameters,
-                                 GParameter *parameters,
+                                 guint stream_transmitter_n_parameters,
+                                 GParameter *stream_transmitter_parameters,
                                  GError **error);
 
 gboolean fs_session_start_telephony_event (FsSession *session, guint8 event,
-- 
1.5.6.5




More information about the farsight-commits mailing list