diff options
Diffstat (limited to 'main')
-rw-r--r-- | main/bridge.c (renamed from main/bridging.c) | 16 | ||||
-rw-r--r-- | main/bridge_after.c (renamed from main/bridging_after.c) | 2 | ||||
-rw-r--r-- | main/bridge_basic.c (renamed from main/bridging_basic.c) | 10 | ||||
-rw-r--r-- | main/bridge_channel.c (renamed from main/bridging_channel.c) | 12 | ||||
-rw-r--r-- | main/bridge_roles.c (renamed from main/bridging_roles.c) | 4 | ||||
-rw-r--r-- | main/cel.c | 4 | ||||
-rw-r--r-- | main/channel.c | 2 | ||||
-rw-r--r-- | main/cli.c | 2 | ||||
-rw-r--r-- | main/core_local.c | 2 | ||||
-rw-r--r-- | main/core_unreal.c | 2 | ||||
-rw-r--r-- | main/features.c | 6 | ||||
-rw-r--r-- | main/manager.c | 2 | ||||
-rw-r--r-- | main/manager_bridges.c (renamed from main/manager_bridging.c) | 0 | ||||
-rw-r--r-- | main/parking.c | 2 | ||||
-rw-r--r-- | main/stasis_bridges.c (renamed from main/stasis_bridging.c) | 4 | ||||
-rw-r--r-- | main/stasis_channels.c | 2 |
16 files changed, 36 insertions, 36 deletions
diff --git a/main/bridging.c b/main/bridge.c index 1e1e6c763..bb90de7e4 100644 --- a/main/bridging.c +++ b/main/bridge.c @@ -37,14 +37,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/lock.h" #include "asterisk/linkedlists.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_internal.h" -#include "asterisk/bridging_channel_internal.h" -#include "asterisk/bridging_basic.h" -#include "asterisk/bridging_technology.h" -#include "asterisk/bridging_channel.h" -#include "asterisk/bridging_after.h" -#include "asterisk/stasis_bridging.h" +#include "asterisk/bridge.h" +#include "asterisk/bridge_internal.h" +#include "asterisk/bridge_channel_internal.h" +#include "asterisk/bridge_basic.h" +#include "asterisk/bridge_technology.h" +#include "asterisk/bridge_channel.h" +#include "asterisk/bridge_after.h" +#include "asterisk/stasis_bridges.h" #include "asterisk/stasis_channels.h" #include "asterisk/app.h" #include "asterisk/file.h" diff --git a/main/bridging_after.c b/main/bridge_after.c index 8ab4bc842..7a693952c 100644 --- a/main/bridging_after.c +++ b/main/bridge_after.c @@ -37,7 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" -#include "asterisk/bridging_after.h" +#include "asterisk/bridge_after.h" struct after_bridge_cb_node { /*! Next list node. */ diff --git a/main/bridging_basic.c b/main/bridge_basic.c index 7f9cb71fd..7eaf30eb9 100644 --- a/main/bridging_basic.c +++ b/main/bridge_basic.c @@ -34,17 +34,17 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" #include "asterisk/utils.h" #include "asterisk/linkedlists.h" -#include "asterisk/bridging.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/astobj2.h" #include "asterisk/features_config.h" #include "asterisk/pbx.h" #include "asterisk/file.h" #include "asterisk/app.h" -#include "asterisk/bridging_internal.h" #include "asterisk/dial.h" -#include "asterisk/stasis_bridging.h" +#include "asterisk/stasis_bridges.h" #define NORMAL_FLAGS (AST_BRIDGE_FLAG_DISSOLVE_HANGUP | AST_BRIDGE_FLAG_DISSOLVE_EMPTY \ | AST_BRIDGE_FLAG_SMART) diff --git a/main/bridging_channel.c b/main/bridge_channel.c index 284f08732..1164e4f67 100644 --- a/main/bridging_channel.c +++ b/main/bridge_channel.c @@ -43,12 +43,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/pbx.h" #include "asterisk/channel.h" #include "asterisk/timing.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_channel.h" -#include "asterisk/bridging_after.h" -#include "asterisk/bridging_channel_internal.h" -#include "asterisk/bridging_internal.h" -#include "asterisk/stasis_bridging.h" +#include "asterisk/bridge.h" +#include "asterisk/bridge_channel.h" +#include "asterisk/bridge_after.h" +#include "asterisk/bridge_channel_internal.h" +#include "asterisk/bridge_internal.h" +#include "asterisk/stasis_bridges.h" #include "asterisk/stasis_channels.h" #include "asterisk/musiconhold.h" #include "asterisk/features_config.h" diff --git a/main/bridging_roles.c b/main/bridge_roles.c index c20b0ccf1..dd1012b9c 100644 --- a/main/bridging_roles.c +++ b/main/bridge_roles.c @@ -39,8 +39,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" #include "asterisk/datastore.h" #include "asterisk/linkedlists.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_roles.h" +#include "asterisk/bridge.h" +#include "asterisk/bridge_roles.h" #include "asterisk/stringfields.h" struct bridge_role_option { diff --git a/main/cel.c b/main/cel.c index 9d21cc8f5..f66fbdcc0 100644 --- a/main/cel.c +++ b/main/cel.c @@ -58,8 +58,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/astobj2.h" #include "asterisk/stasis_message_router.h" #include "asterisk/stasis_channels.h" -#include "asterisk/stasis_bridging.h" -#include "asterisk/bridging.h" +#include "asterisk/stasis_bridges.h" +#include "asterisk/bridge.h" #include "asterisk/parking.h" #include "asterisk/features.h" #include "asterisk/core_local.h" diff --git a/main/channel.c b/main/channel.c index bdcdef5b9..9c4a0ba7a 100644 --- a/main/channel.c +++ b/main/channel.c @@ -72,7 +72,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/data.h" #include "asterisk/channel_internal.h" #include "asterisk/features.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/test.h" #include "asterisk/stasis_channels.h" diff --git a/main/cli.c b/main/cli.c index 34951711f..b4c3b34c7 100644 --- a/main/cli.c +++ b/main/cli.c @@ -60,7 +60,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/threadstorage.h" #include "asterisk/translate.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/stasis_channels.h" #include "asterisk/stasis_bridging.h" diff --git a/main/core_local.c b/main/core_local.c index b35e03110..961a28096 100644 --- a/main/core_local.c +++ b/main/core_local.c @@ -43,7 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/manager.h" #include "asterisk/devicestate.h" #include "asterisk/astobj2.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/core_unreal.h" #include "asterisk/core_local.h" #include "asterisk/stasis.h" diff --git a/main/core_unreal.c b/main/core_unreal.c index 3d14a716f..7b7595b87 100644 --- a/main/core_unreal.c +++ b/main/core_unreal.c @@ -39,7 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/pbx.h" #include "asterisk/musiconhold.h" #include "asterisk/astobj2.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/core_unreal.h" static unsigned int name_sequence = 0; diff --git a/main/features.c b/main/features.c index d1b33d5b9..346e4afd4 100644 --- a/main/features.c +++ b/main/features.c @@ -71,9 +71,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/global_datastores.h" #include "asterisk/astobj2.h" #include "asterisk/test.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_basic.h" -#include "asterisk/bridging_after.h" +#include "asterisk/bridge.h" +#include "asterisk/bridge_basic.h" +#include "asterisk/bridge_after.h" #include "asterisk/stasis.h" #include "asterisk/stasis_channels.h" #include "asterisk/features_config.h" diff --git a/main/manager.c b/main/manager.c index c0f91f5f8..319f8b088 100644 --- a/main/manager.c +++ b/main/manager.c @@ -97,7 +97,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/stasis_bridging.h" #include "asterisk/test.h" #include "asterisk/json.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/features_config.h" #include "asterisk/rtp_engine.h" diff --git a/main/manager_bridging.c b/main/manager_bridges.c index 0bc086d5b..0bc086d5b 100644 --- a/main/manager_bridging.c +++ b/main/manager_bridges.c diff --git a/main/parking.c b/main/parking.c index 02695cd01..820cffdea 100644 --- a/main/parking.c +++ b/main/parking.c @@ -30,7 +30,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/_private.h" #include "asterisk/astobj2.h" #include "asterisk/pbx.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/parking.h" #include "asterisk/channel.h" #include "asterisk/_private.h" diff --git a/main/stasis_bridging.c b/main/stasis_bridges.c index 43ec006a1..97c93e6f9 100644 --- a/main/stasis_bridging.c +++ b/main/stasis_bridges.c @@ -36,8 +36,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" #include "asterisk/stasis_bridging.h" #include "asterisk/stasis_channels.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_technology.h" +#include "asterisk/bridge.h" +#include "asterisk/bridge_technology.h" #define SNAPSHOT_CHANNELS_BUCKETS 13 diff --git a/main/stasis_channels.c b/main/stasis_channels.c index 36a953e26..c71bbbd14 100644 --- a/main/stasis_channels.c +++ b/main/stasis_channels.c @@ -35,7 +35,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/astobj2.h" #include "asterisk/json.h" #include "asterisk/pbx.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/translate.h" #include "asterisk/stasis.h" #include "asterisk/stasis_channels.h" |