diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-14 23:23:58 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-14 23:23:58 +0000 |
| commit | 4df18a07235f587d260c9770b185cf1d4be9d186 (patch) | |
| tree | 22314fb2da89ee378d3fa4d57c4453283a8a0a0c | |
| parent | 9c04dd8d3a65e4b86fdda167069313f6d689fca4 (diff) | |
When a recording ends with '#', we are improperly trimming an extra 200ms from the recording.
Reported by: sim
Patch by: tilghman
Closes issue #11247
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@89275 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/app.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/main/app.c b/main/app.c index 9136175ca..0b57784a3 100644 --- a/main/app.c +++ b/main/app.c @@ -705,8 +705,13 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile, for (x = 0; x < fmtcnt; x++) { if (!others[x]) break; - if (res > 0) - ast_stream_rewind(others[x], totalsilence ? totalsilence - 200 : 200); + /*!\note + * If we ended with silence, trim all but the first 200ms of silence + * off the recording. However, if we ended with '#', we don't want + * to trim ANY part of the recording. + */ + if (res > 0 && totalsilence) + ast_stream_rewind(others[x], totalsilence - 200); ast_truncstream(others[x]); ast_closestream(others[x]); } @@ -721,7 +726,9 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile, realfiles[x] = ast_readfile(recordfile, sfmt[x], comment, O_RDONLY, 0, 0); if (!others[x] || !realfiles[x]) break; - ast_stream_rewind(others[x], totalsilence ? totalsilence - 200 : 200); + /*!\note Same logic as above. */ + if (totalsilence) + ast_stream_rewind(others[x], totalsilence - 200); ast_truncstream(others[x]); /* add the original file too */ while ((fr = ast_readframe(realfiles[x]))) { |