kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

More formatting fixes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3088 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
James Golovich
2004-05-27 00:07:18 +00:00
parent 54780434a6
commit fc7593e594
4 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app.c
View File

@@ -407,9 +407,8 @@ int ast_linear_stream(struct ast_channel *chan, const char *filename, int fd, in
return res;
}
int ast_control_streamfile(struct ast_channel *chan, char *file,char *fwd,char *rev,char *stop,char *pause,int skipms)
int ast_control_streamfile(struct ast_channel *chan, char *file, char *fwd, char *rev, char *stop, char *pause, int skipms)
{
struct timeval started, ended;
long elapsed = 0,last_elapsed =0;
char breaks[5];
@@ -418,68 +417,63 @@ int ast_control_streamfile(struct ast_channel *chan, char *file,char *fwd,char *
if (chan->_state != AST_STATE_UP)
res = ast_answer(chan);
if(stop != NULL && stop[0]) {
if (stop != NULL && stop[0]) {
breaks[x++] = stop[0];
}
if(pause != NULL && pause[0]) {
if (pause != NULL && pause[0]) {
breaks[x++] = pause[0];
}
breaks[x] = '\0';
if(chan)
if (chan)
ast_stopstream(chan);
for(;;) {
for (;;) {
gettimeofday(&started,NULL);
if(chan)
if (chan)
ast_stopstream(chan);
res = ast_streamfile(chan, file, chan->language);
if(!res) {
if (!res) {
res = 1;
if(elapsed) {
ast_stream_fastforward(chan->stream,elapsed);
if (elapsed) {
ast_stream_fastforward(chan->stream, elapsed);
last_elapsed = elapsed - 200;
}
if(res) {
res = ast_waitstream_fr(chan,breaks,fwd,rev,skipms);
}
else {
if (res)
res = ast_waitstream_fr(chan, breaks, fwd, rev, skipms);
else
break;
}
}
if (res < 1)
break;
if(pause != NULL && res == *pause) {
gettimeofday(&ended,NULL);
if (pause != NULL && res == *pause) {
gettimeofday(&ended, NULL);
elapsed = (((ended.tv_sec * 1000) + ended.tv_usec / 1000) - ((started.tv_sec * 1000) + started.tv_usec / 1000) + last_elapsed);
for(;;) {
if(chan)
if (chan)
ast_stopstream(chan);
res = ast_waitfordigit(chan, 1000);
if(res == -1 || res == *pause || (stop && res == *stop))
if (res == -1 || res == *pause || (stop && res == *stop))
break;
}
if(res == *pause) {
if (res == *pause) {
res = 0;
continue;
}
}
if(res == -1)
if (res == -1)
break;
if(stop != NULL && res == *stop) {
if (stop != NULL && res == *stop) {
res = 0;
break;
}
}
if(chan)
if (chan)
ast_stopstream(chan);
return res;
}