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 /channels/chan_h323.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 'channels/chan_h323.c')
| -rw-r--r-- | channels/chan_h323.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 2476f5065..61817dbff 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -2096,18 +2096,17 @@ static void setup_rtp_connection(unsigned call_reference, const char *remoteIp, ast_queue_control(pvt->owner, AST_CONTROL_PROGRESS); switch (rtp_change) { case NEED_HOLD: - ast_queue_control(pvt->owner, AST_CONTROL_HOLD); + ast_queue_hold(pvt->owner, NULL); break; case NEED_UNHOLD: - ast_queue_control(pvt->owner, AST_CONTROL_UNHOLD); + ast_queue_unhold(pvt->owner); break; default: break; } ast_channel_unlock(pvt->owner); pvt_native = ast_format_cap_destroy(pvt_native); - } - else { + } else { if (pvt->options.progress_audio) pvt->newcontrol = AST_CONTROL_PROGRESS; else if (rtp_change == NEED_HOLD) @@ -2599,10 +2598,11 @@ static void remote_hold(unsigned call_reference, const char *token, int is_hold) if (!pvt) return; if (pvt->owner && !ast_channel_trylock(pvt->owner)) { - if (is_hold) - ast_queue_control(pvt->owner, AST_CONTROL_HOLD); - else - ast_queue_control(pvt->owner, AST_CONTROL_UNHOLD); + if (is_hold) { + ast_queue_hold(pvt->owner, NULL); + } else { + ast_queue_unhold(pvt->owner); + } ast_channel_unlock(pvt->owner); } else { |