From 94ab57fd0a8e53278dbff975ae85d67b55620222 Mon Sep 17 00:00:00 2001 From: rizzo Date: Fri, 21 Apr 2006 20:39:50 +0000 Subject: convert to use ast_stream_and_wait git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22076 f38db490-d61c-443f-a65b-d21fe96a405b --- channel.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'channel.c') diff --git a/channel.c b/channel.c index 80b1109ba..a1ba62df4 100644 --- a/channel.c +++ b/channel.c @@ -3230,24 +3230,20 @@ static void bridge_playfile(struct ast_channel *chan, struct ast_channel *peer, } if (!strcmp(sound,"timeleft")) { /* Queue support */ - ast_streamfile(chan, "vm-youhave", chan->language); - ast_waitstream(chan, ""); + ast_stream_and_wait(chan, "vm-youhave", chan->language, ""); if (min) { ast_say_number(chan, min, AST_DIGIT_ANY, chan->language, NULL); - ast_streamfile(chan, "queue-minutes", chan->language); - ast_waitstream(chan, ""); + ast_stream_and_wait(chan, "queue-minutes", chan->language, ""); } if (sec) { ast_say_number(chan, sec, AST_DIGIT_ANY, chan->language, NULL); - ast_streamfile(chan, "queue-seconds", chan->language); - ast_waitstream(chan, ""); + ast_stream_and_wait(chan, "queue-seconds", chan->language, ""); } } else { - ast_streamfile(chan, sound, chan->language); - ast_waitstream(chan, ""); + ast_stream_and_wait(chan, sound, chan->language, ""); } - check = ast_autoservice_stop(peer); + ast_autoservice_stop(peer); } static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct ast_channel *c1, -- cgit v1.2.3