summaryrefslogtreecommitdiff
path: root/include/asterisk/bridge_channel_internal.h
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2013-07-26 16:34:56 +0000
committerJonathan Rose <jrose@digium.com>2013-07-26 16:34:56 +0000
commit9a46c1d0199e5e3627665b68f88d4ec21f09d2a9 (patch)
treeb97e9093f330402a1e2527591bec391612f0f9ee /include/asterisk/bridge_channel_internal.h
parenteec3150a8ac1125ce8c98d741ea3dce0aa72c2f5 (diff)
Add name argument to BridgeWait() so multiple holding bridges may be used
Changes arguments for BridgeWait from BridgeWait(role, options) to BridgeWait(bridge_name, role, options). Now multiple holding bridges may be created and referenced by this application. (closes issue ASTERISK-21922) Reported by: Matt Jordan Review: https://reviewboard.asterisk.org/r/2642/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395509 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/bridge_channel_internal.h')
-rw-r--r--include/asterisk/bridge_channel_internal.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asterisk/bridge_channel_internal.h b/include/asterisk/bridge_channel_internal.h
index 6c3add13b..75fb007f7 100644
--- a/include/asterisk/bridge_channel_internal.h
+++ b/include/asterisk/bridge_channel_internal.h
@@ -117,11 +117,14 @@ void bridge_channel_internal_pull(struct ast_bridge_channel *bridge_channel);
*
* \param bridge_channel The Channel in the bridge
*
+ * \retval 0 bridge channel successfully joined the bridge
+ * \retval -1 bridge channel failed to join the bridge
+ *
* \note This API call starts the bridge_channel's processing of events while
* it is in the bridge. It will return when the channel has been instructed to
* leave the bridge.
*/
-void bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel);
+int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel);
/*!
* \internal