mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 20:08:17 +00:00
A great big renaming patch
This patch renames the bridging* files to bridge*. This may seem pedantic and silly, but it fits better in line with current Asterisk naming conventions: * channel is not "channeling" * monitor is not "monitoring" etc. A bridge is an object. It is a first class citizen in Asterisk. "Bridging" is the act of using a bridge on a set of channels - and the API that fulfills that role is more than just the action. (closes issue ASTERISK-22130) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -40,10 +40,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||
#include "asterisk/pbx.h"
|
||||
#include "asterisk/module.h"
|
||||
#include "asterisk/channel.h"
|
||||
#include "asterisk/bridging.h"
|
||||
#include "asterisk/bridging_internal.h"
|
||||
#include "asterisk/bridging_basic.h"
|
||||
#include "asterisk/bridging_after.h"
|
||||
#include "asterisk/bridge.h"
|
||||
#include "asterisk/bridge_internal.h"
|
||||
#include "asterisk/bridge_basic.h"
|
||||
#include "asterisk/bridge_after.h"
|
||||
#include "asterisk/config_options.h"
|
||||
#include "asterisk/features_config.h"
|
||||
#include "asterisk/astobj2.h"
|
||||
@@ -1403,7 +1403,7 @@ static struct ast_bridge *bridge_agent_hold_new(void)
|
||||
return bridge;
|
||||
}
|
||||
|
||||
static void bridging_init_agent_hold(void)
|
||||
static void bridge_init_agent_hold(void)
|
||||
{
|
||||
/* Setup bridge agent_hold subclass v_table. */
|
||||
bridge_agent_hold_v_table = ast_bridge_base_v_table;
|
||||
@@ -2556,7 +2556,7 @@ static int load_module(void)
|
||||
}
|
||||
|
||||
/* Init agent holding bridge v_table. */
|
||||
bridging_init_agent_hold();
|
||||
bridge_init_agent_hold();
|
||||
|
||||
/* Setup to provide Agent:agent-id device state. */
|
||||
res |= ast_devstate_prov_add("Agent", agent_pvt_devstate_get);
|
||||
|
||||
Reference in New Issue
Block a user