diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
| commit | 3d63833bd6c869b7efa383e8dea14be1a6eff998 (patch) | |
| tree | 34957dd051b8f67c7cc58a510e24ee3873a61ad4 /rest-api-templates | |
| parent | e1e1cc2deefb92f8b43825f1f34e619354737842 (diff) | |
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
Diffstat (limited to 'rest-api-templates')
| -rw-r--r-- | rest-api-templates/res_stasis_json_resource.c.mustache | 1 | ||||
| -rw-r--r-- | rest-api-templates/stasis_json_resource.h.mustache | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/rest-api-templates/res_stasis_json_resource.c.mustache b/rest-api-templates/res_stasis_json_resource.c.mustache index 039830270..a55389c07 100644 --- a/rest-api-templates/res_stasis_json_resource.c.mustache +++ b/rest-api-templates/res_stasis_json_resource.c.mustache @@ -49,6 +49,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "stasis_json/resource_{{name}}.h" {{#has_events}} #include "asterisk/stasis_channels.h" +#include "asterisk/stasis_bridging.h" {{#events}} {{> event_function_decl}} diff --git a/rest-api-templates/stasis_json_resource.h.mustache b/rest-api-templates/stasis_json_resource.h.mustache index f55e830bd..8cfd2c1f7 100644 --- a/rest-api-templates/stasis_json_resource.h.mustache +++ b/rest-api-templates/stasis_json_resource.h.mustache @@ -38,6 +38,7 @@ {{#has_events}} struct ast_channel_snapshot; +struct ast_bridge_snapshot; {{#events}} /*! |