From 8e45c743d1e1192bd32d2fa5b780be02e359f136 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Sat, 30 Oct 2010 01:55:15 +0000
Subject: [PATCH] Merged revisions 293418 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r293418 | rmudgett | 2010-10-29 20:53:29 -0500 (Fri, 29 Oct 2010) | 16 lines
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: https://origsvn.digium.com/svn/asterisk/trunk@293419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_dahdi.c | 11 -----------
channels/sig_analog.c | 14 +-------------
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index ad183744b3..64bfd3295a 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -8193,17 +8193,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 d63f5aa841..1d68889be0 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,
--
GitLab