diff options
| author | Olivier Crête <olivier.crete@collabora.co.uk> | 2011-02-09 11:25:04 +0000 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2011-10-11 15:39:40 -0400 |
| commit | ba8b7d2818e7a78de47d40cc3aa4594458bb0193 (patch) | |
| tree | b807f5d09bfdcd2e76142cfc3850a2a532447ff6 /examples | |
| parent | 49f40c71c2073c94c8f824e3bd1d7594211dc2e9 (diff) | |
| download | farstream-ba8b7d2818e7a78de47d40cc3aa4594458bb0193.tar.gz | |
session: Remove transmitter creation from fs_session_new_stream()
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/commandline/simple-call-shm.c | 10 | ||||
| -rw-r--r-- | examples/commandline/simple-call.c | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/examples/commandline/simple-call-shm.c b/examples/commandline/simple-call-shm.c index a8d81f5a..7d4d61a0 100644 --- a/examples/commandline/simple-call-shm.c +++ b/examples/commandline/simple-call-shm.c @@ -135,6 +135,11 @@ add_audio_session (GstElement *pipeline, FsConference *conf, guint id, gst_object_unref (pad2); gst_object_unref (pad); + ses->stream = fs_session_new_stream (ses->session, part, FS_DIRECTION_BOTH, + &error); + print_error (error); + g_assert (ses->stream); + cand = fs_candidate_new ("", FS_COMPONENT_RTP, FS_CANDIDATE_TYPE_HOST, FS_NETWORK_PROTOCOL_UDP, send_socket, 0); cands = g_list_prepend (NULL, cand); @@ -143,11 +148,8 @@ add_audio_session (GstElement *pipeline, FsConference *conf, guint id, g_value_init (¶m.value, FS_TYPE_CANDIDATE_LIST); g_value_take_boxed (¶m.value, cands); - ses->stream = fs_session_new_stream (ses->session, part, FS_DIRECTION_BOTH, - "shm", 1, ¶m, &error); + res = fs_stream_set_transmitter (ses->stream, "shm", ¶m, 1, &error); print_error (error); - g_assert (ses->stream); - g_value_unset (¶m.value); g_signal_connect (ses->stream, "src-pad-added", diff --git a/examples/commandline/simple-call.c b/examples/commandline/simple-call.c index d4863e6a..e2206418 100644 --- a/examples/commandline/simple-call.c +++ b/examples/commandline/simple-call.c @@ -126,6 +126,11 @@ add_audio_session (GstElement *pipeline, FsConference *conf, guint id, gst_object_unref (pad); + ses->stream = fs_session_new_stream (ses->session, part, FS_DIRECTION_BOTH, + &error); + print_error (error); + g_assert (ses->stream); + cands = g_list_prepend (NULL, fs_candidate_new ("", FS_COMPONENT_RTP, FS_CANDIDATE_TYPE_HOST, FS_NETWORK_PROTOCOL_UDP, NULL, localport)); @@ -133,8 +138,7 @@ add_audio_session (GstElement *pipeline, FsConference *conf, guint id, g_value_init (¶m.value, FS_TYPE_CANDIDATE_LIST); g_value_take_boxed (¶m.value, cands); - ses->stream = fs_session_new_stream (ses->session, part, FS_DIRECTION_BOTH, - "rawudp", 1, ¶m, &error); + res = fs_stream_set_transmitter (ses->stream, "rawudp", ¶m, 1, &error); print_error (error); g_assert (ses->stream); |