diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-07-24 19:24:09 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-07-24 19:24:09 +0000 |
| commit | 1d1650f5729501d1780870e5d3706ac843ca0570 (patch) | |
| tree | f805a4daa815be8bc774e171813f358de8ece05b /main/bridging_basic.c | |
| parent | 644b0e576a8276992962e1ecce2fd7308bac4a85 (diff) | |
Update bridge_channel refactorings; export bridge_ symbol
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395295 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/bridging_basic.c')
| -rw-r--r-- | main/bridging_basic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/bridging_basic.c b/main/bridging_basic.c index 27cbce35c..8fcad7560 100644 --- a/main/bridging_basic.c +++ b/main/bridging_basic.c @@ -285,7 +285,7 @@ static int basic_hangup_hook(struct ast_bridge *bridge, struct ast_bridge_channe } if (2 <= bridge_count) { /* Just allow this channel to leave the multi-party bridge. */ - ast_bridge_change_state(bridge_channel, AST_BRIDGE_CHANNEL_STATE_HANGUP); + ast_bridge_channel_leave_bridge(bridge_channel, AST_BRIDGE_CHANNEL_STATE_END_NO_DISSOLVE); } ast_bridge_unlock(bridge_channel->bridge); return 0; @@ -342,8 +342,8 @@ static int bridge_personality_normal_push(struct ast_bridge *self, struct ast_br return -1; } - bridge_channel_update_accountcodes(bridge_channel, swap); - bridge_channel_update_linkedids(bridge_channel, swap); + ast_bridge_channel_update_accountcodes(bridge_channel, swap); + ast_bridge_channel_update_linkedids(bridge_channel, swap); return 0; } @@ -2659,7 +2659,7 @@ static int feature_attended_transfer(struct ast_bridge *bridge, struct ast_bridg } ast_bridge_channel_write_hold(bridge_channel, NULL); - props->transferee_bridge = bridge_channel_merge_inhibit(bridge_channel, +1); + props->transferee_bridge = ast_bridge_channel_merge_inhibit(bridge_channel, +1); /* Grab the extension to transfer to */ if (grab_transfer(bridge_channel->chan, exten, sizeof(exten), props->context)) { |