diff options
| author | Jason Parker <jparker@digium.com> | 2013-05-24 21:21:25 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2013-05-24 21:21:25 +0000 |
| commit | 154fbf8cae866269cb2b64a5cb26cb4d435cf4df (patch) | |
| tree | bdf1e07244cfee6526570c3b9357da9378981150 /res/res_sip_sdp_rtp.c | |
| parent | 1223199b3d18b82a931475f939170b9379e6afed (diff) | |
Split Hold event into Hold/Unhold, and move it into core.
(closes issue ASTERISK-21487)
Review: https://reviewboard.asterisk.org/r/2565/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389746 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_sip_sdp_rtp.c')
| -rw-r--r-- | res/res_sip_sdp_rtp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/res/res_sip_sdp_rtp.c b/res/res_sip_sdp_rtp.c index bd5be0831..b0c8ae31c 100644 --- a/res/res_sip_sdp_rtp.c +++ b/res/res_sip_sdp_rtp.c @@ -698,15 +698,14 @@ static int apply_negotiated_sdp_stream(struct ast_sip_session *session, struct a (!ast_sockaddr_isnull(addrs) || !pjmedia_sdp_media_find_attr2(remote_stream, "sendonly", NULL))) { /* The remote side has taken us off hold */ - ast_queue_control(session->channel, AST_CONTROL_UNHOLD); + ast_queue_unhold(session->channel); ast_queue_frame(session->channel, &ast_null_frame); session_media->held = 0; } else if (ast_sockaddr_isnull(addrs) || ast_sockaddr_is_any(addrs) || pjmedia_sdp_media_find_attr2(remote_stream, "sendonly", NULL)) { /* The remote side has put us on hold */ - ast_queue_control_data(session->channel, AST_CONTROL_HOLD, S_OR(session->endpoint->mohsuggest, NULL), - !ast_strlen_zero(session->endpoint->mohsuggest) ? strlen(session->endpoint->mohsuggest) + 1 : 0); + ast_queue_hold(session->channel, session->endpoint->mohsuggest); ast_rtp_instance_stop(session_media->rtp); ast_queue_frame(session->channel, &ast_null_frame); session_media->held = 1; |