[asterisk-commits] tilghman: branch 1.6.0 r134164 - in /branches/1.6.0: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Jul 28 17:16:39 2008
New Revision: 134164

URL: http://svn.digium.com/view/asterisk?view=rev&rev=134164
Log:
Merged revisions 134163 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r134163 | tilghman | 2008-07-28 17:07:12 -0500 (Mon, 28 Jul 2008) | 15 lines

Merged revisions 134161 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r134161 | tilghman | 2008-07-28 16:50:50 -0500 (Mon, 28 Jul 2008) | 7 lines

Detect when sox fails to raise the volume, because sox can't read the file.
(closes issue #12939)
 Reported by: rickbradley
 Patches: 
       20080728__bug12939.diff.txt uploaded by Corydon76 (license 14)
 Tested by: rickbradley

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_voicemail.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_voicemail.c?view=diff&rev=134164&r1=134163&r2=134164
==============================================================================
--- branches/1.6.0/apps/app_voicemail.c (original)
+++ branches/1.6.0/apps/app_voicemail.c Mon Jul 28 17:16:39 2008
@@ -2169,10 +2169,16 @@
 			chmod(newtmp, VOICEMAIL_FILE_MODE & ~my_umask);
 			ast_debug(3, "newtmp: %s\n", newtmp);
 			if (tmpfd > -1) {
+				int soxstatus;
 				snprintf(tmpcmd, sizeof(tmpcmd), "sox -v %.4f %s.%s %s.%s", vmu->volgain, attach, format, newtmp, format);
-				ast_safe_system(tmpcmd);
-				attach = newtmp;
-				ast_debug(3, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", attach, format, vmu->volgain, mailbox);
+				if ((soxstatus = ast_safe_system(tmpcmd)) == 0) {
+					attach = newtmp;
+					ast_debug(3, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", attach, format, vmu->volgain, mailbox);
+				} else {
+					ast_log(LOG_WARNING, "Sox failed to reencode %s.%s: %s (have you installed support for all sox file formats?)\n", attach, format,
+						soxstatus == 1 ? "Problem with command line options" : "An error occurred during file processing");
+					ast_log(LOG_WARNING, "Voicemail attachment will have no volume gain.\n");
+				}
 			}
 		}
 		fprintf(p, "--%s" ENDL, bound);