comparison: libpurple/protocols/jabber/jingle/rtp.c
libpurple/protocols/jabber/jingle/rtp.c
- branch
- vv
- changeset 26514
- 058053cffc0e
- parent 26501
- c186275f46aa
- child 26617
- 514bdfc137d5
equal
deleted
inserted
replaced
| 26513:15e72929718f | 26514:058053cffc0e |
|---|---|
| 533 static gboolean | 533 static gboolean |
| 534 jingle_rtp_init_media(JingleContent *content) | 534 jingle_rtp_init_media(JingleContent *content) |
| 535 { | 535 { |
| 536 JingleSession *session = jingle_content_get_session(content); | 536 JingleSession *session = jingle_content_get_session(content); |
| 537 PurpleMedia *media = jingle_rtp_get_media(session); | 537 PurpleMedia *media = jingle_rtp_get_media(session); |
| 538 gchar *creator; | |
| 538 gchar *media_type; | 539 gchar *media_type; |
| 539 gchar *remote_jid; | 540 gchar *remote_jid; |
| 540 gchar *senders; | 541 gchar *senders; |
| 541 gchar *name; | 542 gchar *name; |
| 542 const gchar *transmitter; | 543 const gchar *transmitter; |
| 543 gboolean is_audio; | 544 gboolean is_audio; |
| 545 gboolean is_creator; | |
| 544 PurpleMediaSessionType type; | 546 PurpleMediaSessionType type; |
| 545 JingleTransport *transport; | 547 JingleTransport *transport; |
| 546 GParameter *params = NULL; | 548 GParameter *params = NULL; |
| 547 guint num_params; | 549 guint num_params; |
| 548 | 550 |
| 580 type = is_audio == TRUE ? PURPLE_MEDIA_RECV_AUDIO | 582 type = is_audio == TRUE ? PURPLE_MEDIA_RECV_AUDIO |
| 581 : PURPLE_MEDIA_RECV_VIDEO; | 583 : PURPLE_MEDIA_RECV_VIDEO; |
| 582 | 584 |
| 583 params = | 585 params = |
| 584 jingle_get_params(jingle_session_get_js(session), &num_params); | 586 jingle_get_params(jingle_session_get_js(session), &num_params); |
| 587 | |
| 588 creator = jingle_content_get_creator(content); | |
| 589 if (!strcmp(creator, "initiator")) | |
| 590 is_creator = jingle_session_is_initiator(session); | |
| 591 else | |
| 592 is_creator = !jingle_session_is_initiator(session); | |
| 593 g_free(creator); | |
| 594 | |
| 585 purple_media_add_stream(media, name, remote_jid, | 595 purple_media_add_stream(media, name, remote_jid, |
| 586 type, transmitter, num_params, params); | 596 type, is_creator, transmitter, num_params, params); |
| 587 | 597 |
| 588 g_free(name); | 598 g_free(name); |
| 589 g_free(media_type); | 599 g_free(media_type); |
| 590 g_free(remote_jid); | 600 g_free(remote_jid); |
| 591 g_free(senders); | 601 g_free(senders); |
