[svn-commits] mmichelson: branch 1.6.0 r130175 - in /branches/1.6.0: ./ main/audiohook.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Jul 11 14:14:50 2008
New Revision: 130175

URL: http://svn.digium.com/view/asterisk?view=rev&rev=130175
Log:
Merged revisions 130174 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r130174 | mmichelson | 2008-07-11 14:14:15 -0500 (Fri, 11 Jul 2008) | 15 lines

Merged revisions 130173 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r130173 | mmichelson | 2008-07-11 14:13:29 -0500 (Fri, 11 Jul 2008) | 7 lines

Fix a typo in audiohook_read_frame_both.

While this change has not been proven to fix any
specific issue, it is incorrect and could cause
unforeseen problems.


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/audiohook.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/audiohook.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/audiohook.c?view=diff&rev=130175&r1=130174&r2=130175
==============================================================================
--- branches/1.6.0/main/audiohook.c (original)
+++ branches/1.6.0/main/audiohook.c Fri Jul 11 14:14:50 2008
@@ -207,7 +207,7 @@
 	}
 
 	/* If we want to provide only a write factory make sure we aren't waiting for other audio */
-	if (usable_write && !usable_read && (ast_tvdiff_ms(ast_tvnow(), audiohook->write_time) < (samples/8)*2)) {
+	if (usable_write && !usable_read && (ast_tvdiff_ms(ast_tvnow(), audiohook->read_time) < (samples/8)*2)) {
 		ast_debug(1, "Read factory %p was pretty quick last time, waiting for them.\n", &audiohook->read_factory);
 		return NULL;
 	}