summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/commandline/simple-call-shm.c3
-rw-r--r--gst-libs/gst/farsight/fs-base-conference.c4
-rw-r--r--gst-libs/gst/farsight/fs-base-conference.h1
-rw-r--r--gst-libs/gst/farsight/fs-participant.c2
-rw-r--r--gst/fsmsnconference/fs-msn-conference.c1
-rw-r--r--gst/fsrtpconference/fs-rtp-conference.c1
-rw-r--r--python/example.py2
-rw-r--r--tests/check/msn/conference.c4
-rw-r--r--tests/check/rtp/codecs.c13
-rw-r--r--tests/check/rtp/conference.c3
-rw-r--r--tests/check/rtp/generic.c2
-rw-r--r--tests/check/rtp/recvcodecs.c2
-rw-r--r--tests/check/rtp/sendcodecs.c2
13 files changed, 16 insertions, 24 deletions
diff --git a/examples/commandline/simple-call-shm.c b/examples/commandline/simple-call-shm.c
index c56ce23c..02600f55 100644
--- a/examples/commandline/simple-call-shm.c
+++ b/examples/commandline/simple-call-shm.c
@@ -340,8 +340,7 @@ int main (int argc, char **argv)
conf = gst_element_factory_make ("fsrtpconference", NULL);
g_assert (conf);
- part = fs_conference_new_participant (FS_CONFERENCE (conf), "test@ignore",
- &error);
+ part = fs_conference_new_participant (FS_CONFERENCE (conf), &error);
print_error (error);
g_assert (part);
diff --git a/gst-libs/gst/farsight/fs-base-conference.c b/gst-libs/gst/farsight/fs-base-conference.c
index 49651c04..db2b7fd2 100644
--- a/gst-libs/gst/farsight/fs-base-conference.c
+++ b/gst-libs/gst/farsight/fs-base-conference.c
@@ -75,7 +75,6 @@ static FsSession *fs_base_conference_new_session (FsConference *conf,
FsMediaType media_type,
GError **error);
static FsParticipant *fs_base_conference_new_participant (FsConference *conf,
- const gchar *cname,
GError **error);
void fs_base_conference_error (GObject *signal_src, GObject *error_src,
@@ -181,7 +180,6 @@ fs_base_conference_error (GObject *signal_src, GObject *error_src,
static FsParticipant *
fs_base_conference_new_participant (FsConference *conf,
- const gchar *cname,
GError **error)
{
FsBaseConference *baseconf;
@@ -193,5 +191,5 @@ fs_base_conference_new_participant (FsConference *conf,
klass = FS_BASE_CONFERENCE_GET_CLASS (conf);
g_return_val_if_fail (klass->new_participant, NULL);
- return klass->new_participant (baseconf, cname, error);
+ return klass->new_participant (baseconf, error);
}
diff --git a/gst-libs/gst/farsight/fs-base-conference.h b/gst-libs/gst/farsight/fs-base-conference.h
index ac5a57dd..549a3ae9 100644
--- a/gst-libs/gst/farsight/fs-base-conference.h
+++ b/gst-libs/gst/farsight/fs-base-conference.h
@@ -92,7 +92,6 @@ struct _FsBaseConferenceClass
FsMediaType media_type,
GError **error);
FsParticipant *(*new_participant) (FsBaseConference *conference,
- const gchar *cname,
GError **error);
/*< private >*/
diff --git a/gst-libs/gst/farsight/fs-participant.c b/gst-libs/gst/farsight/fs-participant.c
index 5ae972ee..9da8c9c5 100644
--- a/gst-libs/gst/farsight/fs-participant.c
+++ b/gst-libs/gst/farsight/fs-participant.c
@@ -101,7 +101,7 @@ fs_participant_class_init (FsParticipantClass *klass)
"The cname of the participant",
"A string of the cname of the participant",
NULL,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* FsParticipant::error:
diff --git a/gst/fsmsnconference/fs-msn-conference.c b/gst/fsmsnconference/fs-msn-conference.c
index 3d4fc289..f88224d7 100644
--- a/gst/fsmsnconference/fs-msn-conference.c
+++ b/gst/fsmsnconference/fs-msn-conference.c
@@ -99,7 +99,6 @@ static FsSession *fs_msn_conference_new_session (FsBaseConference *conf,
GError **error);
static FsParticipant *fs_msn_conference_new_participant (FsBaseConference *conf,
- const gchar *cname,
GError **error);
static void _remove_session (gpointer user_data,
diff --git a/gst/fsrtpconference/fs-rtp-conference.c b/gst/fsrtpconference/fs-rtp-conference.c
index 72596a17..ec04f14f 100644
--- a/gst/fsrtpconference/fs-rtp-conference.c
+++ b/gst/fsrtpconference/fs-rtp-conference.c
@@ -654,7 +654,6 @@ fs_rtp_conference_new_participant (FsBaseConference *conf,
{
FsRtpConference *self = FS_RTP_CONFERENCE (conf);
FsParticipant *new_participant = NULL;
- GList *item = NULL;
if (!self->gstrtpbin)
{
diff --git a/python/example.py b/python/example.py
index f862315a..bd869cf0 100644
--- a/python/example.py
+++ b/python/example.py
@@ -10,7 +10,7 @@ conference.set_property ("sdes-cname", sys.argv[1] + "@1.2.3.4")
pipeline.add (conference)
session = conference.new_session (farsight.MEDIA_TYPE_VIDEO)
-participant = conference.new_participant (sys.argv[2]+"@1.2.3.4")
+participant = conference.new_participant ()
stream = session.new_stream (participant, farsight.DIRECTION_BOTH, "multicast")
stream.set_remote_codecs([farsight.Codec(96, "H263-1998",
diff --git a/tests/check/msn/conference.c b/tests/check/msn/conference.c
index f6ac834b..afdf652c 100644
--- a/tests/check/msn/conference.c
+++ b/tests/check/msn/conference.c
@@ -234,7 +234,7 @@ setup_conference (FsStreamDirection dir, struct SimpleMsnConference *target)
ts_fail_unless (gst_bin_add (GST_BIN (dat->pipeline),
GST_ELEMENT (dat->conf)));
- dat->part = fs_conference_new_participant (dat->conf, "", &error);
+ dat->part = fs_conference_new_participant (dat->conf, &error);
ts_fail_unless (error == NULL, "Error: %s", error ? error->message: "");
ts_fail_unless (dat->part != NULL);
@@ -366,7 +366,7 @@ GST_START_TEST (test_msnconference_error)
GError *error = NULL;
ts_fail_unless (
- fs_conference_new_participant (dat->conf, "", &error) == NULL);
+ fs_conference_new_participant (dat->conf, &error) == NULL);
ts_fail_unless (error->domain == FS_ERROR &&
error->code == FS_ERROR_ALREADY_EXISTS);
g_clear_error (&error);
diff --git a/tests/check/rtp/codecs.c b/tests/check/rtp/codecs.c
index 909ea8f3..d21de923 100644
--- a/tests/check/rtp/codecs.c
+++ b/tests/check/rtp/codecs.c
@@ -482,8 +482,7 @@ GST_START_TEST (test_rtpcodecs_reserved_pt)
dat = setup_simple_conference (1, "fsrtpconference", "bob@127.0.0.1");
- p = fs_conference_new_participant (FS_CONFERENCE (dat->conference),
- "aa", NULL);
+ p = fs_conference_new_participant (FS_CONFERENCE (dat->conference), NULL);
fail_if (p == NULL, "Could not add participant");
s = fs_session_new_stream (dat->session, p,
@@ -724,7 +723,7 @@ _bus_message_element (GstBus *bus, GstMessage *message,
/* Add a second stream */
p2 = fs_conference_new_participant (FS_CONFERENCE (cd->dat->conference),
- "name2", &error);
+ &error);
if (!p2)
fail ("Could not add second participant to conference %s", error->message);
@@ -824,7 +823,7 @@ run_test_rtpcodecs_config_data (gboolean preset_remotes)
cd.participant = fs_conference_new_participant (
- FS_CONFERENCE (cd.dat->conference), "name", NULL);
+ FS_CONFERENCE (cd.dat->conference), NULL);
fail_if (cd.participant == NULL, "Could not add participant to conference");
@@ -1174,7 +1173,7 @@ GST_START_TEST (test_rtpcodecs_ptime)
fs_codec_list_destroy (codecs);
participant = fs_conference_new_participant (
- FS_CONFERENCE (dat->conference), "name", NULL);
+ FS_CONFERENCE (dat->conference), NULL);
fail_if (participant == NULL, "Could not add participant to conference");
stream = fs_session_new_stream (dat->session, participant,
@@ -1271,7 +1270,7 @@ setup_codec_tests (struct SimpleTestConference **dat,
mediatype);
*participant = fs_conference_new_participant (
- FS_CONFERENCE ((*dat)->conference), "name", NULL);
+ FS_CONFERENCE ((*dat)->conference), NULL);
fail_if (participant == NULL, "Could not add participant to conference");
bus = gst_pipeline_get_bus (GST_PIPELINE ((*dat)->pipeline));
@@ -2269,7 +2268,7 @@ GST_START_TEST (test_rtpcodecs_nego_hdrext)
FS_MEDIA_TYPE_AUDIO);
participant = fs_conference_new_participant (
- FS_CONFERENCE (dat->conference), "name", NULL);
+ FS_CONFERENCE (dat->conference), NULL);
fail_if (participant == NULL, "Could not add participant to conference");
bus = gst_pipeline_get_bus (GST_PIPELINE (dat->pipeline));
diff --git a/tests/check/rtp/conference.c b/tests/check/rtp/conference.c
index f3c56d3b..5329d44d 100644
--- a/tests/check/rtp/conference.c
+++ b/tests/check/rtp/conference.c
@@ -925,7 +925,6 @@ GST_START_TEST (test_rtpconference_errors)
dat = setup_simple_conference (1, "fsrtpconference", "bob@127.0.0.1");
participant = fs_conference_new_participant (FS_CONFERENCE (dat->conference),
- "bob2@127.0.0.1",
NULL);
ts_fail_if (participant == NULL, "Could not create participant");
@@ -1233,7 +1232,7 @@ GST_START_TEST (test_rtpconference_dispose)
session = fs_conference_new_session (conf, FS_MEDIA_TYPE_AUDIO, &error);
fail_if (session == NULL || error != NULL);
- part = fs_conference_new_participant (conf, "name@1.2.3.4", &error);
+ part = fs_conference_new_participant (conf, &error);
fail_if (part == NULL || error != NULL);
stream = fs_session_new_stream (session, part, FS_DIRECTION_BOTH, "rawudp",
diff --git a/tests/check/rtp/generic.c b/tests/check/rtp/generic.c
index 51747ec4..7cd998d2 100644
--- a/tests/check/rtp/generic.c
+++ b/tests/check/rtp/generic.c
@@ -117,7 +117,7 @@ simple_conference_add_stream (
st->target = target;
st->participant = fs_conference_new_participant (
- FS_CONFERENCE (dat->conference), NULL, &error);
+ FS_CONFERENCE (dat->conference), &error);
if (error)
fail ("Error while creating new participant (%d): %s",
error->code, error->message);
diff --git a/tests/check/rtp/recvcodecs.c b/tests/check/rtp/recvcodecs.c
index 10751397..afd9abb4 100644
--- a/tests/check/rtp/recvcodecs.c
+++ b/tests/check/rtp/recvcodecs.c
@@ -215,7 +215,7 @@ GST_START_TEST (test_rtprecv_inband_config_data)
}
participant = fs_conference_new_participant (
- FS_CONFERENCE (conference), "blob@blob.com", &error);
+ FS_CONFERENCE (conference), &error);
if (error)
ts_fail ("Error while creating new participant (%d): %s",
error->code, error->message);
diff --git a/tests/check/rtp/sendcodecs.c b/tests/check/rtp/sendcodecs.c
index 0e42e89e..15b9dab7 100644
--- a/tests/check/rtp/sendcodecs.c
+++ b/tests/check/rtp/sendcodecs.c
@@ -290,7 +290,7 @@ one_way (GstElement *recv_pipeline, gint port)
g_idle_add (_start_pipeline, dat);
participant = fs_conference_new_participant (
- FS_CONFERENCE (dat->conference), "blob@blob.com", &error);
+ FS_CONFERENCE (dat->conference), &error);
if (error)
ts_fail ("Error while creating new participant (%d): %s",
error->code, error->message);
View Lorry Controller Status