kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Channels: Masquerades to automatically move frame/audio hooks

Browse Source 
Whenever possible, audiohooks and framehooks will now be copied over
to the channel that the masquerading channel gets cloned into. This
should occur for all audiohooks and most framehooks. As a result,
in Asterisk 12.5 and up, the AUDIOHOOK_INHERIT function is now
deprecated and its behavior is essentially the new default for all
audiohooks, plus some additional audiohooks/framehooks.

Review: https://reviewboard.asterisk.org/r/3721/
........

Merged revisions 418914 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418936 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2014-07-18 16:28:10 +00:00
parent 5c988cc4e6
commit af4cd65143
12 changed files with 217 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
main/audiohook.c
View File

@@ -586,15 +586,10 @@ static struct ast_audiohook *find_audiohook_by_source(struct ast_audiohook_list
return NULL;
}
void ast_audiohook_move_by_source(struct ast_channel *old_chan, struct ast_channel *new_chan, const char *source)
static void audiohook_move(struct ast_channel *old_chan, struct ast_channel *new_chan, struct ast_audiohook *audiohook)
{
struct ast_audiohook *audiohook;
enum ast_audiohook_status oldstatus;
if (!ast_channel_audiohooks(old_chan) || !(audiohook = find_audiohook_by_source(ast_channel_audiohooks(old_chan), source))) {
return;
}
/* By locking both channels and the audiohook, we can assure that
* another thread will not have a chance to read the audiohook's status
* as done, even though ast_audiohook_remove signals the trigger
@@ -610,6 +605,48 @@ void ast_audiohook_move_by_source(struct ast_channel *old_chan, struct ast_chann
ast_audiohook_unlock(audiohook);
}
void ast_audiohook_move_by_source(struct ast_channel *old_chan, struct ast_channel *new_chan, const char *source)
{
struct ast_audiohook *audiohook;
if (!ast_channel_audiohooks(old_chan)) {
return;
}
audiohook = find_audiohook_by_source(ast_channel_audiohooks(old_chan), source);
if (!audiohook) {
return;
}
audiohook_move(old_chan, new_chan, audiohook);
}
void ast_audiohook_move_all(struct ast_channel *old_chan, struct ast_channel *new_chan)
{
struct ast_audiohook *audiohook;
struct ast_audiohook_list *audiohook_list;
audiohook_list = ast_channel_audiohooks(old_chan);
if (!audiohook_list) {
return;
}
AST_LIST_TRAVERSE_SAFE_BEGIN(&audiohook_list->spy_list, audiohook, list) {
audiohook_move(old_chan, new_chan, audiohook);
}
AST_LIST_TRAVERSE_SAFE_END;
AST_LIST_TRAVERSE_SAFE_BEGIN(&audiohook_list->whisper_list, audiohook, list) {
audiohook_move(old_chan, new_chan, audiohook);
}
AST_LIST_TRAVERSE_SAFE_END;
AST_LIST_TRAVERSE_SAFE_BEGIN(&audiohook_list->manipulate_list, audiohook, list) {
audiohook_move(old_chan, new_chan, audiohook);
}
AST_LIST_TRAVERSE_SAFE_END;
}
/*! \brief Detach specified source audiohook from channel
* \param chan Channel to detach from
* \param source Name of source to detach