From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 28 Jul 2008 22:07:12 +0000 (+0000)
Subject: Merged revisions 134161 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~1568
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68880b4e1098e9bdcba948fe4fa5c6cc14e790ba;p=thirdparty%2Fasterisk.git

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index e83eaf2705..8a7b2aaeea 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -2600,10 +2600,16 @@ static int add_email_attachment(FILE *p, struct ast_vm_user *vmu, char *format,
 		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);