diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-10-09 21:47:02 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-10-09 21:47:02 +0000 |
| commit | 8b14e5f4931dea5116900b19dea20d0a03d1e287 (patch) | |
| tree | f9b107bc541ba906160fa855fc9578091738ea28 /apps | |
| parent | f5d5eb5e19282177f875c5670dd04ca99823a171 (diff) | |
Reverting format addition for now
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@148071 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_minivm.c | 5 | ||||
| -rw-r--r-- | apps/app_voicemail.c | 20 |
2 files changed, 5 insertions, 20 deletions
diff --git a/apps/app_minivm.c b/apps/app_minivm.c index b900f2f1b..c151068df 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -917,11 +917,8 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu ast_debug(3, "-_-_- Sending mail to %s@%s - Using template %s\n", vmu->username, vmu->domain, template->name); - if (!strcmp(format, "wav49")) { + if (!strcmp(format, "wav49")) format = "WAV"; - } else if (!strcmp(format, "wav16")) { - format = "Wav"; - } /* If we have a gain option, process it now with sox */ diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 87b10b166..9f2c335e8 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1755,11 +1755,8 @@ static int imap_store_file(char *dir, char *mailboxuser, char *mailboxcontext, i tempcopy = 1; } - if (!strcmp(fmt, "wav49")) { + if (!strcmp(fmt, "wav49")) fmt = "WAV"; - } else if (!strcmp(fmt, "wav16")) { - fmt = "Wav"; - } ast_debug(3, "Storing file '%s', format '%s'\n", fn, fmt); /* Make a temporary file instead of piping directly to sendmail, in case the mail @@ -2756,11 +2753,8 @@ static int retrieve_file(char *dir, int msgnum) c = strchr(fmt, '|'); if (c) *c = '\0'; - if (!strcasecmp(fmt, "wav49")) { + if (!strcasecmp(fmt, "wav49")) strcpy(fmt, "WAV"); - } else if (!strcasecmp(fmt, "wav16")) { - strcpy(fmt, "Wav"); - } snprintf(msgnums, sizeof(msgnums),"%d", msgnum); if (msgnum > -1) make_file(fn, sizeof(fn), dir, msgnum); @@ -3173,11 +3167,8 @@ static int store_file(char *dir, char *mailboxuser, char *mailboxcontext, int ms c = strchr(fmt, '|'); if (c) *c = '\0'; - if (!strcasecmp(fmt, "wav49")) { + if (!strcasecmp(fmt, "wav49")) strcpy(fmt, "WAV"); - } else if (!strcasecmp(fmt, "wav16")) { - strcpy(fmt, "Wav"); - } snprintf(msgnums, sizeof(msgnums),"%d", msgnum); if (msgnum > -1) make_file(fn, sizeof(fn), dir, msgnum); @@ -3998,11 +3989,8 @@ static int sendmail(char *srcemail, struct ast_vm_user *vmu, int msgnum, char *c ast_log(AST_LOG_WARNING, "E-mail address missing for mailbox [%s]. E-mail will not be sent.\n", vmu->mailbox); return(0); } - if (!strcmp(format, "wav49")) { + if (!strcmp(format, "wav49")) format = "WAV"; - } else if (!strcmp(format, "wav16")) { - format = "Wav"; - } ast_debug(3, "Attaching file '%s', format '%s', uservm is '%d', global is %d\n", attach, format, attach_user_voicemail, ast_test_flag((&globalflags), VM_ATTACH)); /* Make a temporary file instead of piping directly to sendmail, in case the mail command hangs */ |