diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
| commit | 3d63833bd6c869b7efa383e8dea14be1a6eff998 (patch) | |
| tree | 34957dd051b8f67c7cc58a510e24ee3873a61ad4 /channels/chan_vpb.cc | |
| parent | e1e1cc2deefb92f8b43825f1f34e619354737842 (diff) | |
Merge in the bridge_construction branch to make the system use the Bridging API.
Breaks many things until they can be reworked. A partial list:
chan_agent
chan_dahdi, chan_misdn, chan_iax2 native bridging
app_queue
COLP updates
DTMF attended transfers
Protocol attended transfers
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_vpb.cc')
| -rw-r--r-- | channels/chan_vpb.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc index 58fc73f69..d1747cb06 100644 --- a/channels/chan_vpb.cc +++ b/channels/chan_vpb.cc @@ -2267,13 +2267,7 @@ static void *do_chanreads(void *pvt) else bridgerec = 0; } else { - ast_verb(5, "%s: chanreads: No native bridge.\n", p->dev); - if (ast_channel_internal_bridged_channel(p->owner)) { - ast_verb(5, "%s: chanreads: Got Asterisk bridge with [%s].\n", p->dev, ast_channel_name(ast_channel_internal_bridged_channel(p->owner))); - bridgerec = 1; - } else { - bridgerec = 0; - } + bridgerec = ast_channel_is_bridged(p->owner) ? 1 : 0; } /* if ((p->owner->_state != AST_STATE_UP) || !bridgerec) */ |