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 /include | |
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 'include')
-rw-r--r-- | include/asterisk/bridge.h (renamed from include/asterisk/bridging.h) | 6 | ||||
-rw-r--r-- | include/asterisk/bridge_after.h (renamed from include/asterisk/bridging_after.h) | 0 | ||||
-rw-r--r-- | include/asterisk/bridge_basic.h (renamed from include/asterisk/bridging_basic.h) | 0 | ||||
-rw-r--r-- | include/asterisk/bridge_channel.h (renamed from include/asterisk/bridging_channel.h) | 2 | ||||
-rw-r--r-- | include/asterisk/bridge_channel_internal.h (renamed from include/asterisk/bridging_channel_internal.h) | 0 | ||||
-rw-r--r-- | include/asterisk/bridge_features.h (renamed from include/asterisk/bridging_features.h) | 0 | ||||
-rw-r--r-- | include/asterisk/bridge_internal.h (renamed from include/asterisk/bridging_internal.h) | 0 | ||||
-rw-r--r-- | include/asterisk/bridge_roles.h (renamed from include/asterisk/bridging_roles.h) | 0 | ||||
-rw-r--r-- | include/asterisk/bridge_technology.h (renamed from include/asterisk/bridging_technology.h) | 0 | ||||
-rw-r--r-- | include/asterisk/core_unreal.h | 2 | ||||
-rw-r--r-- | include/asterisk/doxygen/architecture.h | 13 | ||||
-rw-r--r-- | include/asterisk/features.h | 2 | ||||
-rw-r--r-- | include/asterisk/stasis_bridges.h (renamed from include/asterisk/stasis_bridging.h) | 2 |
13 files changed, 15 insertions, 12 deletions
diff --git a/include/asterisk/bridging.h b/include/asterisk/bridge.h index 7e22dba64..3d7cf4e06 100644 --- a/include/asterisk/bridging.h +++ b/include/asterisk/bridge.h @@ -69,9 +69,9 @@ extern "C" { #endif -#include "asterisk/bridging_features.h" -#include "asterisk/bridging_channel.h" -#include "asterisk/bridging_roles.h" +#include "asterisk/bridge_features.h" +#include "asterisk/bridge_channel.h" +#include "asterisk/bridge_roles.h" #include "asterisk/dsp.h" #include "asterisk/uuid.h" diff --git a/include/asterisk/bridging_after.h b/include/asterisk/bridge_after.h index 53f30b9ad..53f30b9ad 100644 --- a/include/asterisk/bridging_after.h +++ b/include/asterisk/bridge_after.h diff --git a/include/asterisk/bridging_basic.h b/include/asterisk/bridge_basic.h index 4db142946..4db142946 100644 --- a/include/asterisk/bridging_basic.h +++ b/include/asterisk/bridge_basic.h diff --git a/include/asterisk/bridging_channel.h b/include/asterisk/bridge_channel.h index f58fba7dc..5da1653fa 100644 --- a/include/asterisk/bridging_channel.h +++ b/include/asterisk/bridge_channel.h @@ -53,7 +53,7 @@ extern "C" { #endif -#include "asterisk/bridging_technology.h" +#include "asterisk/bridge_technology.h" /*! \brief State information about a bridged channel */ enum bridge_channel_state { diff --git a/include/asterisk/bridging_channel_internal.h b/include/asterisk/bridge_channel_internal.h index 6c3add13b..6c3add13b 100644 --- a/include/asterisk/bridging_channel_internal.h +++ b/include/asterisk/bridge_channel_internal.h diff --git a/include/asterisk/bridging_features.h b/include/asterisk/bridge_features.h index 05fdf2587..05fdf2587 100644 --- a/include/asterisk/bridging_features.h +++ b/include/asterisk/bridge_features.h diff --git a/include/asterisk/bridging_internal.h b/include/asterisk/bridge_internal.h index 18ef56e96..18ef56e96 100644 --- a/include/asterisk/bridging_internal.h +++ b/include/asterisk/bridge_internal.h diff --git a/include/asterisk/bridging_roles.h b/include/asterisk/bridge_roles.h index d90e564b7..d90e564b7 100644 --- a/include/asterisk/bridging_roles.h +++ b/include/asterisk/bridge_roles.h diff --git a/include/asterisk/bridging_technology.h b/include/asterisk/bridge_technology.h index 534eb5417..534eb5417 100644 --- a/include/asterisk/bridging_technology.h +++ b/include/asterisk/bridge_technology.h diff --git a/include/asterisk/core_unreal.h b/include/asterisk/core_unreal.h index 751c5d455..c7a82ef92 100644 --- a/include/asterisk/core_unreal.h +++ b/include/asterisk/core_unreal.h @@ -31,7 +31,7 @@ #include "asterisk/astobj2.h" #include "asterisk/channel.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/abstract_jb.h" #if defined(__cplusplus) || defined(c_plusplus) diff --git a/include/asterisk/doxygen/architecture.h b/include/asterisk/doxygen/architecture.h index 5d5c706d2..9cf15c723 100644 --- a/include/asterisk/doxygen/architecture.h +++ b/include/asterisk/doxygen/architecture.h @@ -53,7 +53,7 @@ -# \ref ArchConceptBridging -# \ref ArchCodeFlows -# \ref ArchCodeFlowPlayback - -# \ref ArchCodeFlowBridge + -# \ref ArchCodeFlowBridge -# \ref ArchDataStructures -# \ref ArchAstobj2 -# \ref ArchLinkedLists @@ -258,11 +258,14 @@ in the source tree. For a list of bridge technology implementations, see \ref bridges. For additional information on the bridging API, see -<code>include/asterisk/bridging.h</code> and -<code>include/asterisk/bridging_technology.h</code>. +\arg <code>include/asterisk/bridge.h</code> +\arg <code>include/asterisk/bridge_technology.h</code> +\arg <code>include/asterisk/bridge_channel.h</code> +\arg <code>include/asterisk/bridge_features.h</code> +\arg <code>include/asterisk/bridge_after.h</code> For additional implementation details regarding the core bridging API, see -<code>main/bridging.c</code>. +<code>main/bridging.c</code> and <code>main/bridging_channel.c</code>. \subsection ArchInterfaceCDR Call Detail Record (CDR) Handlers @@ -436,7 +439,7 @@ Asterisk CLI operates using connections to a UNIX %domain socket. There are other miscellaneous threads throughout the system that perform a specific task. For example, the event API (include/asterisk/event.h) uses a thread internally (main/event.c) to handle asychronous event dispatching. The devicestate API -(include/asterisk/devicestate.h) uses a thread internally (main/devicestate.c) +(include/asterisk/devicestate.h) uses a thread internally (main/devicestate.c) to asynchronously process device state changes. diff --git a/include/asterisk/features.h b/include/asterisk/features.h index 96eec98c8..5293e6505 100644 --- a/include/asterisk/features.h +++ b/include/asterisk/features.h @@ -26,7 +26,7 @@ #include "asterisk/pbx.h" #include "asterisk/linkedlists.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #define FEATURE_MAX_LEN 11 #define FEATURE_APP_LEN 64 diff --git a/include/asterisk/stasis_bridging.h b/include/asterisk/stasis_bridges.h index 336d7dd5d..973b00c47 100644 --- a/include/asterisk/stasis_bridging.h +++ b/include/asterisk/stasis_bridges.h @@ -28,7 +28,7 @@ extern "C" { #include "asterisk/lock.h" #include "asterisk/linkedlists.h" #include "asterisk/channel.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/pbx.h" /*! |