diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-05-31 15:34:20 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-05-31 15:34:20 +0000 |
| commit | ccc8cc5346f7f68f38b1749755777a33cd897f07 (patch) | |
| tree | 994ae78a31cd77542073af477e3111795a3740b9 /include | |
| parent | a1494300c935864074b000dc33590010c70e749b (diff) | |
Fixup hold/unhold with attended and blind transfers.
* DTMF attended and blind transfers have hold/unhold behavior restored.
* External attended and blind transfers unhold the transfered party when
the transfer is initiated.
* Made prohibit blind transferring a bridge marked as masquerade only.
(ConfBridge bridges)
* Made running an application or playing a file inside a bridge post the
hold/unhold messages if MOH is requested.
Review: https://reviewboard.asterisk.org/r/2574/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@390289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/bridging.h | 21 | ||||
| -rw-r--r-- | include/asterisk/stasis_channels.h | 13 |
2 files changed, 34 insertions, 0 deletions
diff --git a/include/asterisk/bridging.h b/include/asterisk/bridging.h index e6d6623c2..b589874b0 100644 --- a/include/asterisk/bridging.h +++ b/include/asterisk/bridging.h @@ -1110,6 +1110,27 @@ void ast_bridge_channel_queue_control_data(struct ast_bridge_channel *bridge_cha void ast_bridge_channel_write_control_data(struct ast_bridge_channel *bridge_channel, enum ast_control_frame_type control, const void *data, size_t datalen); /*! + * \brief Write a hold frame into the bridge. + * \since 12.0.0 + * + * \param bridge_channel Which channel is putting the hold into the bridge. + * \param moh_class The suggested music class for the other end to use. + * + * \return Nothing + */ +void ast_bridge_channel_write_hold(struct ast_bridge_channel *bridge_channel, const char *moh_class); + +/*! + * \brief Write an unhold frame into the bridge. + * \since 12.0.0 + * + * \param bridge_channel Which channel is putting the hold into the bridge. + * + * \return Nothing + */ +void ast_bridge_channel_write_unhold(struct ast_bridge_channel *bridge_channel); + +/*! * \brief Run an application on the bridge channel. * \since 12.0.0 * diff --git a/include/asterisk/stasis_channels.h b/include/asterisk/stasis_channels.h index 64224c04f..d16b92dc2 100644 --- a/include/asterisk/stasis_channels.h +++ b/include/asterisk/stasis_channels.h @@ -273,6 +273,19 @@ void ast_multi_channel_blob_add_channel(struct ast_multi_channel_blob *obj, const char *role, struct ast_channel_snapshot *snapshot); /*! + * \brief Publish a channel blob message. + * \since 12.0.0 + * + * \param chan Channel publishing the blob. + * \param type Type of stasis message. + * \param blob The blob being published. (NULL if no blob) + * + * \return Nothing + */ +void ast_channel_publish_blob(struct ast_channel *chan, struct stasis_message_type *type, + struct ast_json *blob); + +/*! * \since 12 * \brief Publish a \ref ast_channel_snapshot for a channel. * |