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

Merged revisions 94122 via svnmerge from

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

........
r94122 | mmichelson | 2007-12-19 17:02:22 -0600 (Wed, 19 Dec 2007) | 6 lines

Sox versions 13.0.0 and newer do not have "soxmix" and instead use sox -m. res_monitor
needs to use this if the user does not have soxmix.

(closes issue #11589, reported by amessina, patch inspired by amessina but with a flourish from me)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94123 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2007-12-19 23:04:32 +00:00
parent 0e08d5e7dc
commit 16df336a72
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/res_monitor.c
View File

@@ -69,8 +69,13 @@ static char *monitor_descrip = " Monitor([file_format[:urlbase],[fname_base],[o
" m - when the recording ends mix the two leg files into one and\n" " m - when the recording ends mix the two leg files into one and\n"
" delete the two leg files. If the variable MONITOR_EXEC is set, the\n" " delete the two leg files. If the variable MONITOR_EXEC is set, the\n"
" application referenced in it will be executed instead of\n" " application referenced in it will be executed instead of\n"
#ifdef HAVE_SOXMIX
" soxmix and the raw leg files will NOT be deleted automatically.\n" " soxmix and the raw leg files will NOT be deleted automatically.\n"
" soxmix or MONITOR_EXEC is handed 3 arguments, the two leg files\n" " soxmix or MONITOR_EXEC is handed 3 arguments, the two leg files\n"
#else
" sox and the raw leg files will NOT be deleted automatically.\n"
" sox or MONITOR_EXEC is handed 3 arguments, the two leg files\n"
#endif
" and a target mixed file name which is the same as the leg file names\n" " and a target mixed file name which is the same as the leg file names\n"
" only without the in/out designator.\n" " only without the in/out designator.\n"
" If MONITOR_EXEC_ARGS is set, the contents will be passed on as\n" " If MONITOR_EXEC_ARGS is set, the contents will be passed on as\n"
@@ -325,8 +330,12 @@ int ast_monitor_stop(struct ast_channel *chan, int need_lock)
/* Set the execute application */ /* Set the execute application */
execute = pbx_builtin_getvar_helper(chan, "MONITOR_EXEC"); execute = pbx_builtin_getvar_helper(chan, "MONITOR_EXEC");
if (ast_strlen_zero(execute)) { if (ast_strlen_zero(execute)) {
#ifdef HAVE_SOXMIX
execute = "nice -n 19 soxmix"; execute = "nice -n 19 soxmix";
#else
execute = "nice -n 19 sox -m";
#endif
format = get_soxmix_format(format); format = get_soxmix_format(format);
delfiles = 1; delfiles = 1;
} }