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_motif.c | |
| 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_motif.c')
| -rw-r--r-- | channels/chan_motif.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/channels/chan_motif.c b/channels/chan_motif.c index 0836972e1..56b06b145 100644 --- a/channels/chan_motif.c +++ b/channels/chan_motif.c @@ -360,7 +360,6 @@ static struct ast_channel_tech jingle_tech = { .send_text = jingle_sendtext, .send_digit_begin = jingle_digit_begin, .send_digit_end = jingle_digit_end, - .bridge = ast_rtp_instance_bridge, .call = jingle_call, .hangup = jingle_hangup, .answer = jingle_answer, |