[asterisk-commits] mmichelson: branch 1.4 r94122 - /branches/1.4/res/res_monitor.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Dec 19 17:02:22 2007
New Revision: 94122

URL: http://svn.digium.com/view/asterisk?view=rev&rev=94122
Log:
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)


Modified:
    branches/1.4/res/res_monitor.c

Modified: branches/1.4/res/res_monitor.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_monitor.c?view=diff&rev=94122&r1=94121&r2=94122
==============================================================================
--- branches/1.4/res/res_monitor.c (original)
+++ branches/1.4/res/res_monitor.c Wed Dec 19 17:02:22 2007
@@ -74,8 +74,13 @@
 "    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"
@@ -298,8 +303,12 @@
 
 			/* 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;
 			}