rtpconference: Pass the SDES GstStructure as-is

2 files changed, 11 insertions, 4 deletions

diff --git a/tests/check/rtp/conference.c b/tests/check/rtp/conference.c
index 5e807281..840f98af 100644
--- a/tests/check/rtp/conference.c
+++ b/tests/check/rtp/conference.c
@@ -73,13 +73,16 @@ GST_START_TEST (test_rtpconference_new)
   FsSession *sess = NULL;
   FsParticipant *part = NULL;
   FsStreamDirection dir;
+  GstStructure *s;
 
   dat = setup_simple_conference (1, "fsrtpconference", "bob@127.0.0.1");
   st = simple_conference_add_stream (dat, dat, "rawudp", 0, NULL);
 
-  g_object_get (dat->conference, "sdes-cname", &str, NULL);
-  ts_fail_unless (!strcmp (str, "bob@127.0.0.1"), "Conference CNAME is wrong");
-  g_free (str);
+  g_object_get (dat->conference, "sdes", &s, NULL);
+  ts_fail_unless (gst_structure_get_string (s, "cname") &&
+      !strcmp (gst_structure_get_string (s, "cname"),
+          "bob@127.0.0.1"), "Conference CNAME is wrong");
+  gst_structure_free (s);
 
   g_object_get (st->participant, "cname", &str, NULL);
   ts_fail_unless (str == NULL);
diff --git a/tests/check/rtp/generic.c b/tests/check/rtp/generic.c
index 7cd998d2..78f3076b 100644
--- a/tests/check/rtp/generic.c
+++ b/tests/check/rtp/generic.c
@@ -55,6 +55,7 @@ setup_simple_conference_full (
   GError *error = NULL;
   guint tos;
   GstBus *bus;
+  GstStructure *s;
 
   dat->id = id;
   dat->cname = g_strdup (cname);
@@ -72,7 +73,10 @@ setup_simple_conference_full (
   fail_unless (gst_bin_add (GST_BIN (dat->pipeline), dat->conference),
       "Could not add conference to the pipeline");
 
-  g_object_set (dat->conference, "sdes-cname", cname, NULL);
+  g_object_get (dat->conference, "sdes", &s, NULL);
+  gst_structure_set (s, "cname", G_TYPE_STRING, cname, NULL);
+  g_object_set (dat->conference, "sdes", s, NULL);
+  gst_structure_free (s);
 
   dat->session = fs_conference_new_session (FS_CONFERENCE (dat->conference),
       mediatype, &error);