kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2008-04-15 20:27:04 +00:00
parent 5b4222c9de
commit fe65716e15
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/app_directory.c
View File

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