summaryrefslogtreecommitdiff
path: root/include/asterisk/doxygen/architecture.h
diff options
context:
space:
mode:
authorMatthew Jordan <mjordan@digium.com>2013-07-25 04:06:32 +0000
committerMatthew Jordan <mjordan@digium.com>2013-07-25 04:06:32 +0000
commitcafc1158961f28ad54ebcdc5e042bf8094cbc620 (patch)
tree2e54d30ea5d8db7e007ff5c653c5acd4ed3fb649 /include/asterisk/doxygen/architecture.h
parent9d8a5ceb02f6559940bd94aaf163a544ce6e6f4c (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/asterisk/doxygen/architecture.h')
-rw-r--r--include/asterisk/doxygen/architecture.h13
1 files changed, 8 insertions, 5 deletions
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.