diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-19 23:04:32 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-19 23:04:32 +0000 |
| commit | 42d281c046718585c8d192449f8b212f43a837c8 (patch) | |
| tree | 8b2af3827ab097d2964cbac7228d0da40079217e /res | |
| parent | 64ff93596e318b40377244fc7d52e169f4076adb (diff) | |
Merged revisions 94122 via svnmerge from
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: http://svn.digium.com/svn/asterisk/trunk@94123 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_monitor.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/res/res_monitor.c b/res/res_monitor.c index 3ce3b6d90..3e4c099f4 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -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" " delete the two leg files. If the variable MONITOR_EXEC is set, the\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 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" " only without the in/out designator.\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 */ 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"; +#else + execute = "nice -n 19 sox -m"; +#endif format = get_soxmix_format(format); delfiles = 1; } |