[svn-commits] tilghman: branch 1.4 r179468 - /branches/1.4/main/app.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Mar  2 17:09:01 2009
New Revision: 179468

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=179468
Log:
When ending a recording with silence detection, remember to reduce the duration.
The end of the recording is correspondingly trimmed, but the duration was not
trimmed by the number of seconds trimmed, so the saved duration was necessarily
longer than the actual soundfile duration.
(closes issue #14406)
 Reported by: sasargen
 Patches: 
       20090226__bug14406.diff.txt uploaded by tilghman (license 14)
 Tested by: sasargen

Modified:
    branches/1.4/main/app.c

Modified: branches/1.4/main/app.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/main/app.c?view=diff&rev=179468&r1=179467&r2=179468
==============================================================================
--- branches/1.4/main/app.c (original)
+++ branches/1.4/main/app.c Mon Mar  2 17:09:01 2009
@@ -731,8 +731,16 @@
 			 * off the recording.  However, if we ended with '#', we don't want
 			 * to trim ANY part of the recording.
 			 */
-			if (res > 0 && totalsilence)
+			if (res > 0 && totalsilence) {
 				ast_stream_rewind(others[x], totalsilence - 200);
+				/* Reduce duration by a corresponding amount */
+				if (x == 0 && *duration) {
+					*duration -= (totalsilence - 200) / 1000;
+					if (*duration < 0) {
+						*duration = 0;
+					}
+				}
+			}
 			ast_truncstream(others[x]);
 			ast_closestream(others[x]);
 		}