dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

If somebody enters a digit during ast_stream_and_wait, the return value is the digit, which we need to use later. 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114149 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
qwell 2008-04-15 20:27:04 +00:00
parent b482d688d0
commit 5e488b20d2
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/app_directory.c
View File

@ -858,14 +858,23 @@ static int directory_exec(struct ast_channel *chan, void *data)
if (!ast_strlen_zero(dirintro) && !res) {
res = ast_stream_and_wait(chan, dirintro, AST_DIGIT_ANY);
} else if (!res) {
res = ast_stream_and_wait(chan, "dir-welcome", AST_DIGIT_ANY) ||
ast_stream_and_wait(chan, "dir-pls-enter", AST_DIGIT_ANY) ||
ast_stream_and_wait(chan, digits, AST_DIGIT_ANY) ||
ast_stream_and_wait(chan,
/* Stop playing sounds as soon as we have a digit. */
res = ast_stream_and_wait(chan, "dir-welcome", AST_DIGIT_ANY);
if (!res) {
res = ast_stream_and_wait(chan, "dir-pls-enter", AST_DIGIT_ANY);
}
if (!res) {
res = ast_stream_and_wait(chan, digits, AST_DIGIT_ANY);
}
if (!res) {
res = ast_stream_and_wait(chan,
which == FIRST ? "dir-first" :
which == LAST ? "dir-last" :
"dir-firstlast", AST_DIGIT_ANY) ||
"dir-firstlast", AST_DIGIT_ANY);
}
if (!res) {
ast_stream_and_wait(chan, "dir-usingkeypad", AST_DIGIT_ANY);
}
}
ast_stopstream(chan);
if (!res)