diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-07-25 04:06:32 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-07-25 04:06:32 +0000 |
| commit | cafc1158961f28ad54ebcdc5e042bf8094cbc620 (patch) | |
| tree | 2e54d30ea5d8db7e007ff5c653c5acd4ed3fb649 /apps/confbridge | |
| parent | 9d8a5ceb02f6559940bd94aaf163a544ce6e6f4c (diff) | |
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
Diffstat (limited to 'apps/confbridge')
| -rw-r--r-- | apps/confbridge/conf_chan_announce.c | 2 | ||||
| -rw-r--r-- | apps/confbridge/conf_chan_record.c | 2 | ||||
| -rw-r--r-- | apps/confbridge/conf_config_parser.c | 2 | ||||
| -rw-r--r-- | apps/confbridge/confbridge_manager.c | 4 | ||||
| -rw-r--r-- | apps/confbridge/include/confbridge.h | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/apps/confbridge/conf_chan_announce.c b/apps/confbridge/conf_chan_announce.c index f3ff79fbc..19224254d 100644 --- a/apps/confbridge/conf_chan_announce.c +++ b/apps/confbridge/conf_chan_announce.c @@ -32,7 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/core_unreal.h" #include "include/confbridge.h" diff --git a/apps/confbridge/conf_chan_record.c b/apps/confbridge/conf_chan_record.c index 8198b4fa0..c3f717074 100644 --- a/apps/confbridge/conf_chan_record.c +++ b/apps/confbridge/conf_chan_record.c @@ -32,7 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "include/confbridge.h" /* ------------------------------------------------------------------- */ diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c index 35d96ae31..58431ca3c 100644 --- a/apps/confbridge/conf_config_parser.c +++ b/apps/confbridge/conf_config_parser.c @@ -36,7 +36,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "include/confbridge.h" #include "asterisk/astobj2.h" #include "asterisk/cli.h" -#include "asterisk/bridging_features.h" +#include "asterisk/bridge_features.h" #include "asterisk/stringfields.h" #include "asterisk/pbx.h" diff --git a/apps/confbridge/confbridge_manager.c b/apps/confbridge/confbridge_manager.c index bed4006e8..41314343f 100644 --- a/apps/confbridge/confbridge_manager.c +++ b/apps/confbridge/confbridge_manager.c @@ -28,10 +28,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/stasis.h" #include "asterisk/stasis_channels.h" -#include "asterisk/stasis_bridging.h" +#include "asterisk/stasis_bridges.h" #include "asterisk/manager.h" #include "asterisk/stasis_message_router.h" #include "include/confbridge.h" diff --git a/apps/confbridge/include/confbridge.h b/apps/confbridge/include/confbridge.h index 60b2eab87..7c2abda6c 100644 --- a/apps/confbridge/include/confbridge.h +++ b/apps/confbridge/include/confbridge.h @@ -26,8 +26,8 @@ #include "asterisk/logger.h" #include "asterisk/linkedlists.h" #include "asterisk/channel.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_features.h" +#include "asterisk/bridge.h" +#include "asterisk/bridge_features.h" #include "conf_state.h" /* Maximum length of a conference bridge name */ |