diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-19 23:04:07 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-19 23:04:07 +0000 |
commit | f616aed3d7d63dcfa37f669e63f51d3853d90d4a (patch) | |
tree | 3b53ee1c38ccff9501d47d0f389bd4abfddf4246 /include | |
parent | 811d9372de1ef4443c3372ec8cf9aeb6951470ec (diff) |
Merged revisions 166092,166095 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r166092 | mmichelson | 2008-12-19 16:26:16 -0600 (Fri, 19 Dec 2008) | 28 lines
Adding a new dialplan function AUDIOHOOK_INHERIT
This function is being added as a method to allow for
an audiohook to move to a new channel during a channel
masquerade. The most obvious use for such a facility is
for MixMonitor when a transfer is performed. Prior to
the addition of this functionality, if a channel
running MixMonitor was transferred by another party, then
the recording would stop once the transfer had completed.
By using AUDIOHOOK_INHERIT, you can make MixMonitor
continue recording the call even after the transfer
has completed.
It has also been determined that since this is seen
by most as a bug fix and is not an invasive change,
this functionality will also be backported to 1.4 and
merged into the 1.6.0 branches, even though they are
feature-frozen.
(closes issue #13538)
Reported by: mbit
Patches:
13538.patch uploaded by putnopvut (license 60)
Tested by: putnopvut
Review: http://reviewboard.digium.com/r/102/
........
r166095 | mmichelson | 2008-12-19 16:40:57 -0600 (Fri, 19 Dec 2008) | 5 lines
Remove the verbatim tag from the author line
I could have sworn I already did that before, though...
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@166097 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/audiohook.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/include/asterisk/audiohook.h b/include/asterisk/audiohook.h index d8a6eac6a..231c8c2c5 100644 --- a/include/asterisk/audiohook.h +++ b/include/asterisk/audiohook.h @@ -150,6 +150,21 @@ int ast_audiohook_detach(struct ast_audiohook *audiohook); */ int ast_audiohook_detach_list(struct ast_audiohook_list *audiohook_list); +/*! \brief Move an audiohook from one channel to a new one + * + * \todo Currently only the first audiohook of a specific source found will be moved. + * We should add the capability to move multiple audiohooks from a single source as well. + * + * \note It is required that both old_chan and new_chan are locked prior to calling + * this function. Besides needing to protect the data within the channels, not locking + * these channels can lead to a potential deadlock + * + * \param old_chan The source of the audiohook to move + * \param new_chan The destination to which we want the audiohook to move + * \param source The source of the audiohook we want to move + */ +void ast_audiohook_move_by_source(struct ast_channel *old_chan, struct ast_channel *new_chan, const char *source); + /*! * \brief Detach specified source audiohook from channel * @@ -162,6 +177,18 @@ int ast_audiohook_detach_list(struct ast_audiohook_list *audiohook_list); */ int ast_audiohook_detach_source(struct ast_channel *chan, const char *source); +/*! + * \brief Remove an audiohook from a specified channel + * + * \param chan Channel to remove from + * \param audiohook Audiohook to remove + * + * \return Returns 0 on success, -1 on failure + * + * \note The channel does not need to be locked before calling this function + */ +int ast_audiohook_remove(struct ast_channel *chan, struct ast_audiohook *audiohook); + /*! \brief Pass a frame off to be handled by the audiohook core * \param chan Channel that the list is coming off of * \param audiohook_list List of audiohooks |