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

applied two of the 3 chunks in #6907, and a similar one

Browse Source 
(replace nested 'if' with '&&')
I cannot make sense of the first chunk of the proposed patch,
i think the original is correct.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20225 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-15 00:53:04 +00:00
parent 7c1b1cc29e
commit 9250a6d129
1 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app.c
View File

@@ -739,19 +739,13 @@ int ast_play_and_record(struct ast_channel *chan, const char *playfile, const ch
for (x=0;x<fmtcnt;x++) { for (x=0;x<fmtcnt;x++) {
if (!others[x]) if (!others[x])
break; break;
if (res > 0) { if (res > 0)
if (totalsilence) ast_stream_rewind(others[x], totalsilence ? totalsilence-200 : 200);
ast_stream_rewind(others[x], totalsilence-200);
else
ast_stream_rewind(others[x], 200);
}
ast_truncstream(others[x]); ast_truncstream(others[x]);
ast_closestream(others[x]); ast_closestream(others[x]);
} }
if (rfmt) { if (rfmt && ast_set_read_format(chan, rfmt)) {
if (ast_set_read_format(chan, rfmt)) { ast_log(LOG_WARNING, "Unable to restore format %s to channel '%s'\n", ast_getformatname(rfmt), chan->name);
ast_log(LOG_WARNING, "Unable to restore format %s to channel '%s'\n", ast_getformatname(rfmt), chan->name);
}
} }
if (outmsg > 1) { if (outmsg > 1) {
/* Let them know recording is stopped */ /* Let them know recording is stopped */
@@ -982,17 +976,13 @@ int ast_play_and_prepend(struct ast_channel *chan, char *playfile, char *recordf
ast_filedelete(prependfile, sfmt[x]); ast_filedelete(prependfile, sfmt[x]);
} }
} }
if (rfmt) { if (rfmt && ast_set_read_format(chan, rfmt)) {
if (ast_set_read_format(chan, rfmt)) { ast_log(LOG_WARNING, "Unable to restore format %s to channel '%s'\n", ast_getformatname(rfmt), chan->name);
ast_log(LOG_WARNING, "Unable to restore format %s to channel '%s'\n", ast_getformatname(rfmt), chan->name);
}
} }
if (outmsg) { if (outmsg > 1) {
if (outmsg > 1) { /* Let them know it worked */
/* Let them know it worked */ ast_streamfile(chan, "auth-thankyou", chan->language);
ast_streamfile(chan, "auth-thankyou", chan->language); ast_waitstream(chan, "");
ast_waitstream(chan, "");
}
} }
return res; return res;
} }