[asterisk-commits] russell: trunk r46779 - in /trunk: ./ res/res_monitor.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Nov  1 12:29:05 2006
New Revision: 46779

URL: http://svn.digium.com/view/asterisk?rev=46779&view=rev
Log:
Merged revisions 46778 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r46778 | russell | 2006-11-01 13:26:35 -0500 (Wed, 01 Nov 2006) | 17 lines

Merged revisions 46776 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r46776 | russell | 2006-11-01 13:24:17 -0500 (Wed, 01 Nov 2006) | 9 lines

soxmix and Asterisk expect different file extensions for certain formats.  This
was already handled for the wav49 format.  However, it was not handled for
ulaw and alaw.  I fixed this in such a way that using the alternate extensions
for ulaw and alaw will only happen if we know we're calling soxmix, and not a
custom script defined using the MONITOR_EXEC variable.  The wav49 processing
was left alone so that external scripts will see no behavior change.
(issue #7550, reported by mnicholson, proposed patch by junky, committed fix
is a bit different)

........

................

Modified:
    trunk/   (props changed)
    trunk/res/res_monitor.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_monitor.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_monitor.c?rev=46779&r1=46778&r2=46779&view=diff
==============================================================================
--- trunk/res/res_monitor.c (original)
+++ trunk/res/res_monitor.c Wed Nov  1 12:29:05 2006
@@ -233,6 +233,23 @@
 	return res;
 }
 
+/*
+ * The file format extensions that Asterisk uses are not all the same as that
+ * which soxmix expects.  This function ensures that the format used as the
+ * extension on the filename is something soxmix will understand.
+ */
+static const char *get_soxmix_format(const char *format)
+{
+	const char *res = format;
+
+	if (!strcasecmp(format,"ulaw"))
+		res = "ul";
+	if (!strcasecmp(format,"alaw"))
+		res = "al";
+	
+	return res;
+}
+
 /* Stop monitoring a channel */
 int ast_monitor_stop(struct ast_channel *chan, int need_lock)
 {
@@ -275,7 +292,7 @@
 		if (chan->monitor->joinfiles && !ast_strlen_zero(chan->monitor->filename_base)) {
 			char tmp[1024];
 			char tmp2[1024];
-			char *format = !strcasecmp(chan->monitor->format,"wav49") ? "WAV" : chan->monitor->format;
+			const char *format = !strcasecmp(chan->monitor->format,"wav49") ? "WAV" : chan->monitor->format;
 			char *name = chan->monitor->filename_base;
 			int directory = strchr(name, '/') ? 1 : 0;
 			char *dir = directory ? "" : ast_config_AST_MONITOR_DIR;
@@ -285,6 +302,7 @@
 			execute = pbx_builtin_getvar_helper(chan, "MONITOR_EXEC");
 			if (ast_strlen_zero(execute)) { 
 				execute = "nice -n 19 soxmix";
+				format = get_soxmix_format(format);
 				delfiles = 1;
 			} 
 			execute_args = pbx_builtin_getvar_helper(chan, "MONITOR_EXEC_ARGS");