diff options
| author | Terry Wilson <twilson@digium.com> | 2012-03-13 18:20:34 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-03-13 18:20:34 +0000 |
| commit | 786f5898d12d30c481b1d178bb80e5801dbf666f (patch) | |
| tree | 2b5e07ed1b5fbd7aae1187f068eff498621878a2 /channels/chan_unistim.c | |
| parent | 73ec67e008ca6db76625bfc1f992fa726c948837 (diff) | |
Finalize ast_channel opaquification
Review: https://reviewboard.asterisk.org/r/1786/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358907 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_unistim.c')
| -rw-r--r-- | channels/chan_unistim.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 48fde426b..f13105865 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -2306,7 +2306,7 @@ static int write_history(struct unistimsession *pte, char way, char ismissed) static void unistim_quiet_chan(struct ast_channel *chan) { if (chan && ast_channel_state(chan) == AST_STATE_UP) { - if (ast_test_flag(chan, AST_FLAG_MOH)) { + if (ast_test_flag(ast_channel_flags(chan), AST_FLAG_MOH)) { ast_moh_stop(chan); } else if (ast_channel_generatordata(chan)) { ast_deactivate_generator(chan); @@ -2959,11 +2959,11 @@ static void swap_subs(struct unistim_subchannel *a, struct unistim_subchannel *b /* Step 1 : Music On Hold for peer, Dialing screen for us */ static void transfer_call_step1(struct unistimsession *pte) { - struct unistim_subchannel *sub, *sub_trans; + struct unistim_subchannel *sub /*, *sub_trans */; struct unistim_device *d = pte->device; sub = get_sub(d, SUB_REAL); - sub_trans = get_sub(d, SUB_THREEWAY); + /* sub_trans = get_sub(d, SUB_THREEWAY); */ if (!sub || !sub->owner) { ast_log(LOG_WARNING, "Unable to find subchannel for music on hold\n"); @@ -4856,7 +4856,7 @@ static int unistim_hangup(struct ast_channel *ast) refresh_all_favorite(s); /* Update favicons in case of DND keys */ if (s->state == STATE_RINGING && sub->subtype == SUB_RING) { send_no_ring(s); - if (!ast_test_flag(ast, AST_FLAG_ANSWERED_ELSEWHERE) && ast_channel_hangupcause(ast) != AST_CAUSE_ANSWERED_ELSEWHERE) { + if (!ast_test_flag(ast_channel_flags(ast), AST_FLAG_ANSWERED_ELSEWHERE) && ast_channel_hangupcause(ast) != AST_CAUSE_ANSWERED_ELSEWHERE) { d->missed_call++; write_history(s, 'i', 1); } @@ -5872,7 +5872,7 @@ static char *unistim_show_info(struct ast_cli_entry *e, int cmd, struct ast_cli_ if (!sub->owner) { tmp = (void *) -42; } else { - tmp = sub->owner->_bridge; + tmp = ast_channel_internal_bridged_channel(sub->owner); } ast_cli(a->fd, "-->subtype=%s chan=%p rtp=%p bridge=%p line=%p alreadygone=%d softkey=%d\n", |