diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-30 01:53:29 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-30 01:53:29 +0000 |
| commit | edcdc2b86e7c25ef5e3fa8f0fc1ff492cb0a814f (patch) | |
| tree | a93138e36b7a128eebba090b5630cd50fb849679 | |
| parent | 89a85247ab7394864a407421532f6644b1194a51 (diff) | |
Merged revisions 293417 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r293417 | rmudgett | 2010-10-29 20:49:15 -0500 (Fri, 29 Oct 2010) | 9 lines
Merged revisions 293416 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r293416 | rmudgett | 2010-10-29 20:45:49 -0500 (Fri, 29 Oct 2010) | 1 line
Remove some more code that serves no purpose.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@293418 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_dahdi.c | 11 | ||||
| -rw-r--r-- | channels/sig_analog.c | 14 |
2 files changed, 1 insertions, 24 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index d09424eaa..995298240 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -8168,17 +8168,6 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) dahdi_enable_ec(p); ast_hangup(chan); } else { - struct ast_channel *other = ast_bridged_channel(p->subs[SUB_THREEWAY].owner); - int way3bridge = 0, cdr3way = 0; - - if (!other) { - other = ast_bridged_channel(p->subs[SUB_REAL].owner); - } else - way3bridge = 1; - - if (p->subs[SUB_THREEWAY].owner->cdr) - cdr3way = 1; - ast_verb(3, "Started three way call on channel %d\n", p->channel); /* Start music on hold if appropriate */ diff --git a/channels/sig_analog.c b/channels/sig_analog.c index d63f5aa84..1d68889be 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -3113,20 +3113,8 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_ analog_set_echocanceller(p, 1); ast_hangup(chan); } else { - struct ast_channel *other = ast_bridged_channel(p->subs[ANALOG_SUB_THREEWAY].owner); - int way3bridge = 0, cdr3way = 0; - - if (!other) { - other = ast_bridged_channel(p->subs[ANALOG_SUB_REAL].owner); - } else { - way3bridge = 1; - } - - if (p->subs[ANALOG_SUB_THREEWAY].owner->cdr) { - cdr3way = 1; - } - ast_verb(3, "Started three way call on channel %d\n", p->channel); + /* Start music on hold if appropriate */ if (ast_bridged_channel(p->subs[ANALOG_SUB_THREEWAY].owner)) { ast_queue_control_data(p->subs[ANALOG_SUB_THREEWAY].owner, AST_CONTROL_HOLD, |