diff options
| author | Jason Parker <jparker@digium.com> | 2007-06-22 15:03:32 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2007-06-22 15:03:32 +0000 |
| commit | 68ac7f76332fd8ca371c4047a60e87073f8ef50a (patch) | |
| tree | f5736c1a8c247febcff9b3ad7ba3214c2f3a146f /res | |
| parent | aff5425deac1ca59f1275b66e7c46c19495570d3 (diff) | |
Merged revisions 71068 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r71068 | qwell | 2007-06-22 10:00:30 -0500 (Fri, 22 Jun 2007) | 12 lines
Merged revisions 71065 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r71065 | qwell | 2007-06-22 09:52:18 -0500 (Fri, 22 Jun 2007) | 4 lines
Fix a few silly usages of ast_playstream() - it only ever returns 0...
Issue 10035
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71069 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_agi.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index 22c15f661..dc4bbd7f7 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -602,14 +602,10 @@ static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, char res = ast_applystream(chan, fs); if (vfs) vres = ast_applystream(chan, vfs); - res = ast_playstream(fs); + ast_playstream(fs); if (vfs) - vres = ast_playstream(vfs); + ast_playstream(vfs); - if (res) { - fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset); - return (res >= 0) ? RESULT_SHOWUSAGE : RESULT_FAILURE; - } res = ast_waitstream_full(chan, argv[3], agi->audio, agi->ctrl); /* this is to check for if ast_waitstream closed the stream, we probably are at * the end of the stream, return that amount, else check for the amount */ @@ -666,16 +662,10 @@ static int handle_getoption(struct ast_channel *chan, AGI *agi, int argc, char * res = ast_applystream(chan, fs); if (vfs) vres = ast_applystream(chan, vfs); - res = ast_playstream(fs); + ast_playstream(fs); if (vfs) - vres = ast_playstream(vfs); - if (res) { - fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset); - if (res >= 0) - return RESULT_SHOWUSAGE; - else - return RESULT_FAILURE; - } + ast_playstream(vfs); + res = ast_waitstream_full(chan, argv[3], agi->audio, agi->ctrl); /* this is to check for if ast_waitstream closed the stream, we probably are at * the end of the stream, return that amount, else check for the amount */ |