[farsight2/master] Add possiblity to pass strean transmitter parameters in the rtp test

[Olivier Crête]

---
 tests/check/rtp/codecs.c     |    4 ++--
 tests/check/rtp/conference.c |    4 ++--
 tests/check/rtp/generic.c    |    6 ++++--
 tests/check/rtp/generic.h    |    4 +++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/tests/check/rtp/codecs.c b/tests/check/rtp/codecs.c
index e06bd73..7c89ad1 100644
--- a/tests/check/rtp/codecs.c
+++ b/tests/check/rtp/codecs.c
@@ -190,7 +190,7 @@ GST_START_TEST (test_rtpcodecs_two_way_negotiation)
   GError *error = NULL;
 
   dat = setup_simple_conference (1, "fsrtpconference", "bob at 127.0.0.1");
-  st = simple_conference_add_stream (dat, dat);
+  st = simple_conference_add_stream (dat, dat, 0, NULL);
 
   g_signal_connect (dat->session, "notify::codecs",
       G_CALLBACK (_negotiated_codecs_notify), dat);
@@ -289,7 +289,7 @@ GST_START_TEST (test_rtpcodecs_invalid_remote_codecs)
   gboolean rv;
 
   dat = setup_simple_conference (1, "fsrtpconference", "bob at 127.0.0.1");
-  st = simple_conference_add_stream (dat, dat);
+  st = simple_conference_add_stream (dat, dat, 0, NULL);
 
   codecs = g_list_prepend (codecs,
       fs_codec_new (1, "INVALID1", FS_MEDIA_TYPE_AUDIO, 1));
diff --git a/tests/check/rtp/conference.c b/tests/check/rtp/conference.c
index 24ee6fe..5476aa3 100644
--- a/tests/check/rtp/conference.c
+++ b/tests/check/rtp/conference.c
@@ -67,7 +67,7 @@ GST_START_TEST (test_rtpconference_new)
   FsStreamDirection dir;
 
   dat = setup_simple_conference (1, "fsrtpconference", "bob at 127.0.0.1");
-  st = simple_conference_add_stream (dat, dat);
+  st = simple_conference_add_stream (dat, dat, 0, NULL);
 
   g_object_get (dat->conference, "sdes-cname", &str, NULL);
   ts_fail_unless (!strcmp (str, "bob at 127.0.0.1"), "Conference CNAME is wrong");
@@ -742,7 +742,7 @@ nway_test (int in_count, extra_init extrainit)
       {
         struct SimpleTestStream *st = NULL;
 
-        st = simple_conference_add_stream (dats[i], dats[j]);
+        st = simple_conference_add_stream (dats[i], dats[j], 0, NULL);
         st->handoff_handler = G_CALLBACK (_handoff_handler);
         g_signal_connect (st->stream, "src-pad-added",
             G_CALLBACK (_src_pad_added), st);
diff --git a/tests/check/rtp/generic.c b/tests/check/rtp/generic.c
index 512aaab..8e4fcb8 100644
--- a/tests/check/rtp/generic.c
+++ b/tests/check/rtp/generic.c
@@ -66,7 +66,9 @@ setup_simple_conference (
 struct SimpleTestStream *
 simple_conference_add_stream (
     struct SimpleTestConference *dat,
-    struct SimpleTestConference *target)
+    struct SimpleTestConference *target,
+    guint st_param_count,
+    GParameter *st_params)
 {
   struct SimpleTestStream *st = g_new0 (struct SimpleTestStream, 1);
   GError *error = NULL;
@@ -82,7 +84,7 @@ simple_conference_add_stream (
   fail_if (st->participant == NULL, "Could not make participant, but no GError!");
 
   st->stream = fs_session_new_stream (dat->session, st->participant,
-      FS_DIRECTION_BOTH, "rawudp", 0, NULL, &error);
+      FS_DIRECTION_BOTH, "rawudp", st_param_count, st_params, &error);
   if (error)
     fail ("Error while creating new stream (%d): %s",
         error->code, error->message);
diff --git a/tests/check/rtp/generic.h b/tests/check/rtp/generic.h
index 7159903..edd49a9 100644
--- a/tests/check/rtp/generic.h
+++ b/tests/check/rtp/generic.h
@@ -61,7 +61,9 @@ struct SimpleTestConference *setup_simple_conference (
 
 struct SimpleTestStream *simple_conference_add_stream (
     struct SimpleTestConference *dat,
-    struct SimpleTestConference *target);
+    struct SimpleTestConference *target,
+    guint st_param_count,
+    GParameter *st_params);
 
 void setup_fakesrc (struct SimpleTestConference *dat);
 
-- 
1.5.6.5