From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 19 Dec 2007 23:04:32 +0000 (+0000)
Subject: Merged revisions 94122 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~349
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16df336a7293fbe4badfe12c9af1f3db3eb3cf41;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/trunk@94123 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_monitor.c b/res/res_monitor.c
index 3ce3b6d901..3e4c099f48 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;
 			}