diff options
author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-22 15:27:54 +0000 |
---|---|---|
committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-22 15:27:54 +0000 |
commit | 85a2abbbbfafd2400b5bb3331a2882721caa6ece (patch) | |
tree | 9bb95392065c3ae08c273654d351c610c8a8624a /res | |
parent | 90b56f7d3870e4de219a42e609f9ca9776788582 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@71119 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/res_agi.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index 22a5c29d8..4d5ede388 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -569,14 +569,7 @@ static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, char max_length = ast_tellstream(fs); ast_seekstream(fs, sample_offset, SEEK_SET); res = ast_applystream(chan, fs); - res = ast_playstream(fs); - 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(fs); 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 */ @@ -629,14 +622,7 @@ static int handle_getoption(struct ast_channel *chan, AGI *agi, int argc, char * max_length = ast_tellstream(fs); ast_seekstream(fs, sample_offset, SEEK_SET); res = ast_applystream(chan, fs); - res = ast_playstream(fs); - 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(fs); 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 */ |