Merge Mike's announcement enhancements

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3020 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-05-20 00:29:09 +00:00
parent 67e1c59427
commit 61ce929656
3 changed files with 17 additions and 3 deletions

View File

@@ -418,6 +418,7 @@ static int dial_exec(struct ast_channel *chan, void *data)
char *stack,*var;
int play_to_caller=0,play_to_callee=0;
int playargs=0;
int digit = 0;
if (!data) {
ast_log(LOG_WARNING, "Dial requires an argument (technology1/number1&technology2/number2...|optional timeout|options)\n");
@@ -837,11 +838,16 @@ static int dial_exec(struct ast_channel *chan, void *data)
// Now Stream the File
if (!res)
res = ast_streamfile(peer,announcemsg,peer->language);
if (!res)
res = ast_waitstream(peer,"");
if (!res) {
digit = ast_waitstream(peer, AST_DIGIT_ANY);
}
// Ok, done. stop autoservice
res = ast_autoservice_stop(chan);
if (digit > 0 && !res)
res = ast_senddigit(chan, digit);
else
res = digit;
} else
res = 0;