Merge phase 1 support for the new bridging architecture.
authorJoshua Colp <jcolp@digium.com>
Thu, 5 Mar 2009 18:18:27 +0000 (18:18 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 5 Mar 2009 18:18:27 +0000 (18:18 +0000)
commit4c9ab0df8c51c7d9dd2d8cf2f76968ef185214ba
treecc242551fdaa17b1537490b8ec0621d2c3fa2c66
parentdd1a5f1969ea62e83af6f3e2f0162c18384f0891
Merge phase 1 support for the new bridging architecture.

This commit brings in the bridging core, bridging technologies,
and the ConfBridge application.

For usage information on the ConfBridge application please see
the output of "core show application ConfBridge" from the CLI.

For API documentation please see the doxygen page describing the
architecture and the documentation for each API call.

Review: http://reviewboard.digium.com/r/93/

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@180369 65c4cc65-6c06-0410-ace0-fbb531ad65f3
15 files changed:
CHANGES
Makefile
apps/app_confbridge.c [new file with mode: 0644]
bridges/Makefile [new file with mode: 0644]
bridges/bridge_builtin_features.c [new file with mode: 0644]
bridges/bridge_multiplexed.c [new file with mode: 0644]
bridges/bridge_simple.c [new file with mode: 0644]
bridges/bridge_softmix.c [new file with mode: 0644]
channels/chan_bridge.c [new file with mode: 0644]
include/asterisk/bridging.h [new file with mode: 0644]
include/asterisk/bridging_features.h [new file with mode: 0644]
include/asterisk/bridging_technology.h [new file with mode: 0644]
include/asterisk/channel.h
main/Makefile
main/bridging.c [new file with mode: 0644]