summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2013-06-25 22:28:22 +0000
committerJonathan Rose <jrose@digium.com>2013-06-25 22:28:22 +0000
commit854c4c64fe2851312b1e13857dcd18e743e07594 (patch)
tree80d042e06f38f95d4f1fd2adc07658b2cbd46038 /include
parent5b40420813318e08b9186d41aaf1d1aaff8d61e1 (diff)
res_parking: Add Parking manager action to the new parking system
(closes issue ASTERISK-21641) Reported by: Matt Jordan Review: https://reviewboard.asterisk.org/r/2573/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392915 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/features.h30
1 files changed, 29 insertions, 1 deletions
diff --git a/include/asterisk/features.h b/include/asterisk/features.h
index 9b586506f..b3f5e6c74 100644
--- a/include/asterisk/features.h
+++ b/include/asterisk/features.h
@@ -17,7 +17,7 @@
*/
/*! \file
- * \brief Call Parking and Pickup API
+ * \brief Call Parking and Pickup API
* Includes code and algorithms from the Zapata library.
*/
@@ -26,6 +26,7 @@
#include "asterisk/pbx.h"
#include "asterisk/linkedlists.h"
+#include "asterisk/bridging.h"
#define FEATURE_MAX_LEN 11
#define FEATURE_APP_LEN 64
@@ -168,6 +169,33 @@ void ast_bridge_end_dtmf(struct ast_channel *chan, char digit, struct timeval st
int ast_bridge_call(struct ast_channel *chan, struct ast_channel *peer,struct ast_bridge_config *config);
/*!
+ * \brief Add an arbitrary channel to a bridge
+ * \since 12.0.0
+ *
+ * The channel that is being added to the bridge can be in any state: unbridged,
+ * bridged, answered, unanswered, etc. The channel will be added asynchronously,
+ * meaning that when this function returns once the channel has been added to
+ * the bridge, not once the channel has been removed from the bridge.
+ *
+ * In addition, a tone can optionally be played to the channel once the
+ * channel is placed into the bridge.
+ *
+ * \note When this function returns, there is no guarantee that the channel that
+ * was passed in is valid any longer. Do not attempt to operate on the channel
+ * after this function returns.
+ *
+ * \param bridge Bridge to which the channel should be added
+ * \param chan The channel to add to the bridge
+ * \param features Features for this channel in the bridge
+ * \param play_tone Indicates if a tone should be played to the channel
+ * \param xfersound Sound that should be used to indicate transfer with play_tone
+ * \retval 0 Success
+ * \retval -1 Failure
+ */
+int ast_bridge_add_channel(struct ast_bridge *bridge, struct ast_channel *chan,
+ struct ast_bridge_features *features, int play_tone, const char *xfersound);
+
+/*!
* \brief Test if a channel can be picked up.
*
* \param chan Channel to test if can be picked up.