kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 11:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 47284 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47284 | file | 2006-11-07 15:08:52 -0500 (Tue, 07 Nov 2006) | 2 lines

Make MOH work as it did before in chan_local, without this then it can go funky when transfers and MOH are involved. (issue #7671 reported by jmls)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-11-07 20:12:30 +00:00
parent 8b8d8d0b24
commit 66d3792f11
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_local.c
View File

@@ -317,6 +317,12 @@ static int local_indicate(struct ast_channel *ast, int condition, const void *da
struct ast_frame f = { AST_FRAME_CONTROL, }; struct ast_frame f = { AST_FRAME_CONTROL, };
int isoutbound; int isoutbound;
/* If this is an MOH hold or unhold, do it on the Local channel versus real channel */
if (condition == AST_CONTROL_HOLD) {
ast_moh_start(ast, data, NULL);
} else if (condition == AST_CONTROL_UNHOLD) {
ast_moh_stop(ast);
} else {
/* Queue up a frame representing the indication as a control frame */ /* Queue up a frame representing the indication as a control frame */
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
isoutbound = IS_OUTBOUND(ast, p); isoutbound = IS_OUTBOUND(ast, p);
@@ -325,6 +331,8 @@ static int local_indicate(struct ast_channel *ast, int condition, const void *da
f.datalen = datalen; f.datalen = datalen;
res = local_queue_frame(p, isoutbound, &f, ast); res = local_queue_frame(p, isoutbound, &f, ast);
ast_mutex_unlock(&p->lock); ast_mutex_unlock(&p->lock);
}
return res; return res;
} }