kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 12:52:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Just formatting.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2011-09-29 09:32:34 +00:00
parent 50350a47ea
commit c04ab6b35c
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/res_agi.c
View File

@@ -1935,22 +1935,26 @@ static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, const
long sample_offset = 0, max_length;
const char *edigits = "";
if (argc < 4 || argc > 5)
if (argc < 4 || argc > 5) {
return RESULT_SHOWUSAGE;
}
if (argv[3])
if (argv[3]) {
edigits = argv[3];
}
if ((argc > 4) && (sscanf(argv[4], "%30ld", &sample_offset) != 1))
if ((argc > 4) && (sscanf(argv[4], "%30ld", &sample_offset) != 1)) {
return RESULT_SHOWUSAGE;
}
if (!(fs = ast_openstream(chan, argv[2], chan->language))) {
ast_agi_send(agi->fd, chan, "200 result=%d endpos=%ld\n", 0, sample_offset);
return RESULT_SUCCESS;
}
if ((vfs = ast_openvstream(chan, argv[2], chan->language)))
if ((vfs = ast_openvstream(chan, argv[2], chan->language))) {
ast_debug(1, "Ooh, found a video stream, too\n");
}
ast_verb(3, "Playing '%s' (escape_digits=%s) (sample_offset %ld)\n", argv[2], edigits, sample_offset);
@@ -1958,11 +1962,13 @@ static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, const
max_length = ast_tellstream(fs);
ast_seekstream(fs, sample_offset, SEEK_SET);
res = ast_applystream(chan, fs);
if (vfs)
if (vfs) {
ast_applystream(chan, vfs);
}
ast_playstream(fs);
if (vfs)
if (vfs) {
ast_playstream(vfs);
}
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