diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-13 06:00:17 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-13 06:00:17 +0000 |
commit | 7c789eb82053b079393be7ddb8b120224dcabed0 (patch) | |
tree | 63d30fa6775847935ef9a59966b61fabb8b6d3f7 /app.c | |
parent | ff7c3adeddec293e945972a9aaab12aac5f1b41f (diff) |
Merged revisions 7448-7449,7451,7453 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7448 | kpfleming | 2005-12-12 22:25:14 -0600 (Mon, 12 Dec 2005) | 2 lines
use the stream's current point when pausing/unpausing, instead of elapsed time (which doesn't work when the stream has been skipped forward or backward) (issue #5897)
........
r7449 | kpfleming | 2005-12-12 22:43:38 -0600 (Mon, 12 Dec 2005) | 2 lines
only report AGENT_IDLE for callback mode agents when they are actually idle (issue #5902)
........
r7451 | kpfleming | 2005-12-12 23:14:27 -0600 (Mon, 12 Dec 2005) | 2 lines
ensure that hangups while incoming calls are in early state are handled properly (issue #5919)
........
r7453 | kpfleming | 2005-12-12 23:53:00 -0600 (Mon, 12 Dec 2005) | 2 lines
restore ability of caller to hangup calls that are still ringing (issue #5839)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7457 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'app.c')
-rw-r--r-- | app.c | 52 |
1 files changed, 20 insertions, 32 deletions
@@ -430,11 +430,11 @@ int ast_control_streamfile(struct ast_channel *chan, const char *file, const char *stop, const char *pause, const char *restart, int skipms) { - long elapsed = 0, last_elapsed = 0; char *breaks = NULL; char *end = NULL; int blen = 2; int res; + long pause_restart_point = 0; if (stop) blen += strlen(stop); @@ -456,9 +456,6 @@ int ast_control_streamfile(struct ast_channel *chan, const char *file, if (chan->_state != AST_STATE_UP) res = ast_answer(chan); - if (chan) - ast_stopstream(chan); - if (file) { if ((end = strchr(file,':'))) { if (!strcasecmp(end, ":end")) { @@ -469,25 +466,18 @@ int ast_control_streamfile(struct ast_channel *chan, const char *file, } for (;;) { - struct timeval started = ast_tvnow(); - - if (chan) - ast_stopstream(chan); + ast_stopstream(chan); res = ast_streamfile(chan, file, chan->language); if (!res) { - if (end) { - ast_seekstream(chan->stream, 0, SEEK_END); - end=NULL; - } - res = 1; - if (elapsed) { - ast_stream_fastforward(chan->stream, elapsed); - last_elapsed = elapsed - 200; + if (pause_restart_point) { + ast_seekstream(chan->stream, pause_restart_point, SEEK_SET); + pause_restart_point = 0; } - if (res) - res = ast_waitstream_fr(chan, breaks, fwd, rev, skipms); - else - break; + else if (end) { + ast_seekstream(chan->stream, 0, SEEK_END); + end = NULL; + }; + res = ast_waitstream_fr(chan, breaks, fwd, rev, skipms); } if (res < 1) @@ -496,17 +486,16 @@ int ast_control_streamfile(struct ast_channel *chan, const char *file, /* We go at next loop if we got the restart char */ if (restart && strchr(restart, res)) { ast_log(LOG_DEBUG, "we'll restart the stream here at next loop\n"); - elapsed=0; /* To make sure the next stream will start at beginning */ + pause_restart_point = 0; continue; } - if (pause != NULL && strchr(pause, res)) { - elapsed = ast_tvdiff_ms(ast_tvnow(), started) + last_elapsed; - for(;;) { - if (chan) - ast_stopstream(chan); + if (pause && strchr(pause, res)) { + pause_restart_point = ast_tellstream(chan->stream); + for (;;) { + ast_stopstream(chan); res = ast_waitfordigit(chan, 1000); - if (res == 0) + if (!res) continue; else if (res == -1 || strchr(pause, res) || (stop && strchr(stop, res))) break; @@ -516,17 +505,16 @@ int ast_control_streamfile(struct ast_channel *chan, const char *file, continue; } } + if (res == -1) break; /* if we get one of our stop chars, return it to the calling function */ - if (stop && strchr(stop, res)) { - /* res = 0; */ + if (stop && strchr(stop, res)) break; - } } - if (chan) - ast_stopstream(chan); + + ast_stopstream(chan); return res; } |