dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 226531 via svnmerge from 

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

........
  r226531 | file | 2009-10-29 15:11:26 -0300 (Thu, 29 Oct 2009) | 6 lines
  
  Add an option to enabling passing music on hold start and stop requests through instead of
  acting on them in chan_local.
  
  (closes issue #14709)
  Reported by: dimas
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@226532 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
file 2009-10-29 18:13:42 +00:00
parent 2bf61510db
commit 29706c54df
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_local.c
View File

@ -125,6 +125,7 @@ struct local_pvt {
#define LOCAL_LAUNCHED_PBX (1 << 3) /*!< PBX was launched */
#define LOCAL_NO_OPTIMIZATION (1 << 4) /*!< Do not optimize using masquerading */
#define LOCAL_BRIDGE (1 << 5) /*!< Report back the "true" channel as being bridged to */
#define LOCAL_MOH_PASSTHRU (1 << 6) /*!< Pass through music on hold start/stop frames */
static AST_LIST_HEAD_STATIC(locals, local_pvt);
@ -412,9 +413,9 @@ static int local_indicate(struct ast_channel *ast, int condition, const void *da
return -1;
/* If this is an MOH hold or unhold, do it on the Local channel versus real channel */
if (condition == AST_CONTROL_HOLD) {
if (!ast_test_flag(p, LOCAL_MOH_PASSTHRU) && condition == AST_CONTROL_HOLD) {
ast_moh_start(ast, data, NULL);
} else if (condition == AST_CONTROL_UNHOLD) {
} else if (!ast_test_flag(p, LOCAL_MOH_PASSTHRU) && condition == AST_CONTROL_UNHOLD) {
ast_moh_stop(ast);
} else if (condition == AST_CONTROL_CONNECTED_LINE || condition == AST_CONTROL_REDIRECTING) {
struct ast_channel *this_channel;
@ -759,6 +760,9 @@ static struct local_pvt *local_alloc(const char *data, int format)
if (strchr(opts, 'b')) {
ast_set_flag(tmp, LOCAL_BRIDGE);
}
if (strchr(opts, 'm')) {
ast_set_flag(tmp, LOCAL_MOH_PASSTHRU);
}
}
/* Look for a context */

4
doc/tex/localchannel.tex
View File

@ -27,6 +27,10 @@ audio that it receives from the channel that called the local channel. This is
especially in the case of putting chan\_local in between an incoming SIP call
and Asterisk applications, so that the incoming audio will be de-jittered.
Using the "m" option will cause chan_local to forward music on hold start and stop
requests. Normally chan_local acts on them and it is started or stopped on the
Local channel itself.
\subsection{Purpose}
The Local channel construct can be used to establish dialing into any part of