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

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)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7448 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-12-13 04:25:14 +00:00
parent 86bb1472cc
commit f9f44d7d9b
1 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app.c
View File

@@ -430,11 +430,11 @@ int ast_control_streamfile(struct ast_channel *chan, const char *file,
const char *stop, const char *pause, const char *stop, const char *pause,
const char *restart, int skipms) const char *restart, int skipms)
{ {
long elapsed = 0, last_elapsed = 0;
char *breaks = NULL; char *breaks = NULL;
char *end = NULL; char *end = NULL;
int blen = 2; int blen = 2;
int res; int res;
long pause_restart_point = 0;
if (stop) if (stop)
blen += strlen(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) if (chan->_state != AST_STATE_UP)
res = ast_answer(chan); res = ast_answer(chan);
if (chan)
ast_stopstream(chan);
if (file) { if (file) {
if ((end = strchr(file,':'))) { if ((end = strchr(file,':'))) {
if (!strcasecmp(end, ":end")) { if (!strcasecmp(end, ":end")) {
@@ -469,25 +466,18 @@ int ast_control_streamfile(struct ast_channel *chan, const char *file,
} }
for (;;) { for (;;) {
struct timeval started = ast_tvnow(); ast_stopstream(chan);
if (chan)
ast_stopstream(chan);
res = ast_streamfile(chan, file, chan->language); res = ast_streamfile(chan, file, chan->language);
if (!res) { if (!res) {
if (end) { if (pause_restart_point) {
ast_seekstream(chan->stream, pause_restart_point, SEEK_SET);
pause_restart_point = 0;
}
else if (end) {
ast_seekstream(chan->stream, 0, SEEK_END); ast_seekstream(chan->stream, 0, SEEK_END);
end=NULL; end = NULL;
} };
res = 1; res = ast_waitstream_fr(chan, breaks, fwd, rev, skipms);
if (elapsed) {
ast_stream_fastforward(chan->stream, elapsed);
last_elapsed = elapsed - 200;
}
if (res)
res = ast_waitstream_fr(chan, breaks, fwd, rev, skipms);
else
break;
} }
if (res < 1) 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 */ /* We go at next loop if we got the restart char */
if (restart && strchr(restart, res)) { if (restart && strchr(restart, res)) {
ast_log(LOG_DEBUG, "we'll restart the stream here at next loop\n"); 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; continue;
} }
if (pause != NULL && strchr(pause, res)) { if (pause && strchr(pause, res)) {
elapsed = ast_tvdiff_ms(ast_tvnow(), started) + last_elapsed; pause_restart_point = ast_tellstream(chan->stream);
for(;;) { for (;;) {
if (chan) ast_stopstream(chan);
ast_stopstream(chan);
res = ast_waitfordigit(chan, 1000); res = ast_waitfordigit(chan, 1000);
if (res == 0) if (!res)
continue; continue;
else if (res == -1 || strchr(pause, res) || (stop && strchr(stop, res))) else if (res == -1 || strchr(pause, res) || (stop && strchr(stop, res)))
break; break;
@@ -516,17 +505,16 @@ int ast_control_streamfile(struct ast_channel *chan, const char *file,
continue; continue;
} }
} }
if (res == -1) if (res == -1)
break; break;
/* if we get one of our stop chars, return it to the calling function */ /* if we get one of our stop chars, return it to the calling function */
if (stop && strchr(stop, res)) { if (stop && strchr(stop, res))
/* res = 0; */
break; break;
}
} }
if (chan)
ast_stopstream(chan); ast_stopstream(chan);
return res; return res;
} }