kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 07:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

convert to use ast_stream_and_wait

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-21 20:57:29 +00:00
parent d4eea1066b
commit b560433a36
1 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
apps/app_directory.c
View File

@@ -168,47 +168,32 @@ static int play_mailbox_owner(struct ast_channel *chan, char *context, char *dia
(char *)ast_config_AST_SPOOL_DIR, ext); (char *)ast_config_AST_SPOOL_DIR, ext);
if (ast_fileexists(fn, NULL, chan->language) > 0) { if (ast_fileexists(fn, NULL, chan->language) > 0) {
res = ast_streamfile(chan, fn, chan->language); res = ast_stream_and_wait(chan, fn, chan->language, AST_DIGIT_ANY);
if (!res) {
res = ast_waitstream(chan, AST_DIGIT_ANY);
}
ast_stopstream(chan); ast_stopstream(chan);
/* If Option 'e' was specified, also read the extension number with the name */ /* If Option 'e' was specified, also read the extension number with the name */
if (readext) { if (readext) {
res = ast_streamfile(chan, "vm-extension", chan->language); ast_stream_and_wait(chan, "vm-extension", chan->language, AST_DIGIT_ANY);
if (!res)
res = ast_waitstream(chan, AST_DIGIT_ANY);
res = ast_say_character_str(chan, ext, AST_DIGIT_ANY, chan->language); res = ast_say_character_str(chan, ext, AST_DIGIT_ANY, chan->language);
} }
} else if (ast_fileexists(fn2, NULL, chan->language) > 0) { } else if (ast_fileexists(fn2, NULL, chan->language) > 0) {
res = ast_streamfile(chan, fn2, chan->language); res = ast_stream_and_wait(chan, fn2, chan->language, AST_DIGIT_ANY);
if (!res)
res = ast_waitstream(chan, AST_DIGIT_ANY);
ast_stopstream(chan); ast_stopstream(chan);
/* If Option 'e' was specified, also read the extension number with the name */ /* If Option 'e' was specified, also read the extension number with the name */
if (readext) { if (readext) {
res = ast_streamfile(chan, "vm-extension", chan->language); ast_stream_and_wait(chan, "vm-extension", chan->language, AST_DIGIT_ANY);
if (!res) {
res = ast_waitstream(chan, AST_DIGIT_ANY);
}
res = ast_say_character_str(chan, ext, AST_DIGIT_ANY, chan->language); res = ast_say_character_str(chan, ext, AST_DIGIT_ANY, chan->language);
} }
} else { } else {
res = ast_say_character_str(chan, S_OR(name, ext), res = ast_say_character_str(chan, S_OR(name, ext), AST_DIGIT_ANY, chan->language);
AST_DIGIT_ANY, chan->language);
if (!ast_strlen_zero(name) && readext) { if (!ast_strlen_zero(name) && readext) {
res = ast_streamfile(chan, "vm-extension", chan->language); ast_stream_and_wait(chan, "vm-extension", chan->language, AST_DIGIT_ANY);
if (!res)
res = ast_waitstream(chan, AST_DIGIT_ANY);
res = ast_say_character_str(chan, ext, AST_DIGIT_ANY, chan->language); res = ast_say_character_str(chan, ext, AST_DIGIT_ANY, chan->language);
} }
} }
while (loop) { while (loop) {
if (!res) if (!res)
res = ast_streamfile(chan, "dir-instr", chan->language); res = ast_stream_and_wait(chan, "dir-instr", chan->language, AST_DIGIT_ANY);
if (!res)
res = ast_waitstream(chan, AST_DIGIT_ANY);
if (!res) if (!res)
res = ast_waitfordigit(chan, 3000); res = ast_waitfordigit(chan, 3000);
ast_stopstream(chan); ast_stopstream(chan);
@@ -479,9 +464,7 @@ static int directory_exec(struct ast_channel *chan, void *data)
for (;;) { for (;;) {
if (!res) if (!res)
res = ast_streamfile(chan, dirintro, chan->language); res = ast_stream_and_wait(chan, dirintro, chan->language, AST_DIGIT_ANY);
if (!res)
res = ast_waitstream(chan, AST_DIGIT_ANY);
ast_stopstream(chan); ast_stopstream(chan);
if (!res) if (!res)
res = ast_waitfordigit(chan, 5000); res = ast_waitfordigit(chan, 5000);