diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-07-24 15:38:18 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-07-24 15:38:18 +0000 |
| commit | d91dc6d1a8a6e364d9edd6738c20ac5b8545db97 (patch) | |
| tree | 6ed5d5a62860460e387714b9f334cc5d1fae779a /res/parking/parking_bridge.c | |
| parent | 1f0ac51f49ca72d4f36490295ece83fb8e8fe151 (diff) | |
Perform the initial renaming of the Bridging API
This patch does the following:
* It pulls out bridge_channel and puts it into its own translation unit
* It adds public and protected headers for bridging_channel. Protected
functions are appropriate only for the Bridging API and sub-classes of a
bridge.
(issue ASTERISK-22130)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395253 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/parking/parking_bridge.c')
| -rw-r--r-- | res/parking/parking_bridge.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/res/parking/parking_bridge.c b/res/parking/parking_bridge.c index 75bd62bf9..4c9199830 100644 --- a/res/parking/parking_bridge.c +++ b/res/parking/parking_bridge.c @@ -24,12 +24,13 @@ */ #include "asterisk.h" -#include "asterisk/logger.h" #include "res_parking.h" #include "asterisk/astobj2.h" -#include "asterisk/features.h" +#include "asterisk/logger.h" #include "asterisk/say.h" #include "asterisk/term.h" +#include "asterisk/features.h" +#include "asterisk/bridging_internal.h" struct ast_bridge_parking { @@ -447,11 +448,11 @@ struct ast_bridge *bridge_parking_new(struct parking_lot *bridge_lot) { void *bridge; - bridge = ast_bridge_alloc(sizeof(struct ast_bridge_parking), &ast_bridge_parking_v_table); - bridge = ast_bridge_base_init(bridge, AST_BRIDGE_CAPABILITY_HOLDING, + bridge = bridge_alloc(sizeof(struct ast_bridge_parking), &ast_bridge_parking_v_table); + bridge = bridge_base_init(bridge, AST_BRIDGE_CAPABILITY_HOLDING, AST_BRIDGE_FLAG_MERGE_INHIBIT_TO | AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM | AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM); bridge = ast_bridge_parking_init(bridge, bridge_lot); - bridge = ast_bridge_register(bridge); + bridge = bridge_register(bridge); return bridge; } |