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

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Jul 11 15:04:25 2008
New Revision: 130238

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

................
r130237 | mmichelson | 2008-07-11 15:03:55 -0500 (Fri, 11 Jul 2008) | 11 lines

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

........
r130236 | mmichelson | 2008-07-11 15:03:23 -0500 (Fri, 11 Jul 2008) | 3 lines

Remove redundant logic


........

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

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=130238&r1=130237&r2=130238
==============================================================================
--- branches/1.6.0/main/audiohook.c (original)
+++ branches/1.6.0/main/audiohook.c Fri Jul 11 15:04:25 2008
@@ -213,7 +213,7 @@
 	}
 
 	/* Start with the read factory... if there are enough samples, read them in */
-	if (usable_read && ast_slinfactory_available(&audiohook->read_factory) >= samples) {
+	if (usable_read) {
 		if (ast_slinfactory_read(&audiohook->read_factory, buf1, samples)) {
 			read_buf = buf1;
 			/* Adjust read volume if need be */
@@ -232,7 +232,7 @@
 		ast_log(LOG_DEBUG, "Failed to get %d samples from read factory %p\n", (int)samples, &audiohook->read_factory);
 
 	/* Move on to the write factory... if there are enough samples, read them in */
-	if (usable_write && ast_slinfactory_available(&audiohook->write_factory) >= samples) {
+	if (usable_write) {
 		if (ast_slinfactory_read(&audiohook->write_factory, buf2, samples)) {
 			write_buf = buf2;
 			/* Adjust write volume if need be */