Merge in the bridge_construction branch to make the system use the Bridging API.
authorRichard Mudgett <rmudgett@digium.com>
Tue, 21 May 2013 18:00:22 +0000 (18:00 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Tue, 21 May 2013 18:00:22 +0000 (18:00 +0000)
commit3d63833bd6c869b7efa383e8dea14be1a6eff998
tree34957dd051b8f67c7cc58a510e24ee3873a61ad4
parente1e1cc2deefb92f8b43825f1f34e619354737842
Merge in the bridge_construction branch to make the system use the Bridging API.

Breaks many things until they can be reworked.  A partial list:
chan_agent
chan_dahdi, chan_misdn, chan_iax2 native bridging
app_queue
COLP updates
DTMF attended transfers
Protocol attended transfers

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
99 files changed:
CHANGES
UPGRADE.txt
addons/chan_ooh323.c
apps/app_bridgewait.c [new file with mode: 0644]
apps/app_channelredirect.c
apps/app_chanspy.c
apps/app_confbridge.c
apps/app_dial.c
apps/app_dumpchan.c
apps/app_followme.c
apps/app_mixmonitor.c
apps/app_parkandannounce.c [deleted file]
apps/app_queue.c
apps/confbridge/conf_chan_announce.c [new file with mode: 0644]
apps/confbridge/conf_chan_record.c [new file with mode: 0644]
apps/confbridge/conf_config_parser.c
apps/confbridge/confbridge_manager.c [new file with mode: 0644]
apps/confbridge/include/confbridge.h
bridges/bridge_builtin_features.c
bridges/bridge_builtin_interval_features.c [new file with mode: 0644]
bridges/bridge_holding.c [new file with mode: 0644]
bridges/bridge_multiplexed.c [deleted file]
bridges/bridge_native_rtp.c [new file with mode: 0644]
bridges/bridge_simple.c
bridges/bridge_softmix.c
channels/chan_agent.c
channels/chan_bridge.c [deleted file]
channels/chan_dahdi.c
channels/chan_gulp.c
channels/chan_h323.c
channels/chan_iax2.c
channels/chan_jingle.c
channels/chan_local.c [deleted file]
channels/chan_mgcp.c
channels/chan_misdn.c
channels/chan_motif.c
channels/chan_sip.c
channels/chan_skinny.c
channels/chan_unistim.c
channels/chan_vpb.cc
configs/features.conf.sample
configs/res_parking.conf.sample [new file with mode: 0644]
funcs/func_channel.c
funcs/func_frame_trace.c
funcs/func_jitterbuffer.c
include/asterisk/_private.h
include/asterisk/abstract_jb.h
include/asterisk/bridging.h
include/asterisk/bridging_basic.h [new file with mode: 0644]
include/asterisk/bridging_features.h
include/asterisk/bridging_roles.h [new file with mode: 0644]
include/asterisk/bridging_technology.h
include/asterisk/ccss.h
include/asterisk/channel.h
include/asterisk/config_options.h
include/asterisk/core_local.h [new file with mode: 0644]
include/asterisk/core_unreal.h [new file with mode: 0644]
include/asterisk/frame.h
include/asterisk/framehook.h
include/asterisk/manager.h
include/asterisk/parking.h [new file with mode: 0644]
include/asterisk/rtp_engine.h
include/asterisk/stasis_bridging.h [new file with mode: 0644]
main/abstract_jb.c
main/asterisk.c
main/bridging.c
main/bridging_basic.c [new file with mode: 0644]
main/bridging_roles.c [new file with mode: 0644]
main/channel.c
main/channel_internal_api.c
main/cli.c
main/config_options.c
main/core_local.c [new file with mode: 0644]
main/core_unreal.c [new file with mode: 0644]
main/features.c
main/frame.c
main/manager.c
main/manager_bridging.c [new file with mode: 0644]
main/manager_channels.c
main/parking.c [new file with mode: 0644]
main/pbx.c
main/rtp_engine.c
main/stasis_bridging.c [new file with mode: 0644]
main/strings.c
res/Makefile
res/parking/parking_applications.c [new file with mode: 0644]
res/parking/parking_bridge.c [new file with mode: 0644]
res/parking/parking_bridge_features.c [new file with mode: 0644]
res/parking/parking_controller.c [new file with mode: 0644]
res/parking/parking_manager.c [new file with mode: 0644]
res/parking/parking_ui.c [new file with mode: 0644]
res/parking/res_parking.h [new file with mode: 0644]
res/res_parking.c [new file with mode: 0644]
res/res_stasis_json_events.c
res/res_stasis_json_events.exports.in
res/stasis_json/resource_events.h
rest-api-templates/res_stasis_json_resource.c.mustache
rest-api-templates/stasis_json_resource.h.mustache
rest-api/api-docs/events.json