From eb805b409fceff0161ba68facae8f80273071341 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 23 Aug 2005 02:01:37 +0000 Subject: [PATCH] do expensive 'next message number' calculation before playing sounds (issue #4955) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6373 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_voicemail.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 533335fdf4..42b28206fa 100755 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -2255,18 +2255,25 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, int silent, int return ERROR_LOCK_PATH; } - if (res >= 0) { - /* Unless we're *really* silent, try to send the beep */ - res = ast_streamfile(chan, "beep", chan->language); - if (!res) - res = ast_waitstream(chan, ""); - } + /* + * This operation can be very expensive if done say over NFS or if the mailbox has 100+ messages + * in the mailbox. So we should get this first so we don't cut off the first few seconds of the + * message. + */ do { make_file(fn, sizeof(fn), dir, msgnum); if (!EXISTS(dir,msgnum,fn,chan->language)) break; msgnum++; } while (msgnum < vmu->maxmsg); + + /* Now play the beep once we have the message number for our next message. */ + if (res >= 0) { + /* Unless we're *really* silent, try to send the beep */ + res = ast_streamfile(chan, "beep", chan->language); + if (!res) + res = ast_waitstream(chan, ""); + } if (msgnum < vmu->maxmsg) { /* assign a variable with the name of the voicemail file */ pbx_builtin_setvar_helper(chan, "VM_MESSAGEFILE", fn);