kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

add 'restart' character to ast_control_playback function and ControlPlayback() application (issue #4693)

Browse Source 
rework app_controlplayback.c to take into account all Asterisk 1.2 coding style requirements


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-08-22 19:06:42 +00:00
parent 26ea6ea391
commit 69f9c479e7
4 changed files with 70 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app.c
View File

@@ -406,7 +406,10 @@ int ast_linear_stream(struct ast_channel *chan, const char *filename, int fd, in
return res;
}
int ast_control_streamfile(struct ast_channel *chan, const char *file, const char *fwd, const char *rev, const char *stop, const char *pause, int skipms)
int ast_control_streamfile(struct ast_channel *chan, const char *file,
const char *fwd, const char *rev,
const char *stop, const char *pause,
const char *restart, int skipms)
{
long elapsed = 0,last_elapsed =0;
char *breaks=NULL;
@@ -418,12 +421,18 @@ int ast_control_streamfile(struct ast_channel *chan, const char *file, const cha
blen += strlen(stop);
if (pause)
blen += strlen(pause);
if (restart)
blen += strlen(restart);
if (blen > 2) {
breaks = alloca(blen + 1);
breaks[0] = '\0';
strcat(breaks, stop);
strcat(breaks, pause);
if (stop)
strcat(breaks, stop);
if (pause)
strcat(breaks, pause);
if (restart)
strcat(breaks, restart);
}
if (chan->_state != AST_STATE_UP)
res = ast_answer(chan);
@@ -466,6 +475,13 @@ int ast_control_streamfile(struct ast_channel *chan, const char *file, const cha
if (res < 1)
break;
/* 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 */
continue;
}
if (pause != NULL && strchr(pause, res)) {
elapsed = ast_tvdiff_ms(ast_tvnow(), started) + last_elapsed;
for(;;) {