[asterisk-commits] mmichelson: branch 1.4 r130236 - /branches/1.4/main/audiohook.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Jul 11 15:03:24 CDT 2008


Author: mmichelson
Date: Fri Jul 11 15:03:23 2008
New Revision: 130236

URL: http://svn.digium.com/view/asterisk?view=rev&rev=130236
Log:
Remove redundant logic


Modified:
    branches/1.4/main/audiohook.c

Modified: branches/1.4/main/audiohook.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/audiohook.c?view=diff&rev=130236&r1=130235&r2=130236
==============================================================================
--- branches/1.4/main/audiohook.c (original)
+++ branches/1.4/main/audiohook.c Fri Jul 11 15:03:23 2008
@@ -223,7 +223,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 */
@@ -242,7 +242,7 @@
 		ast_log(LOG_DEBUG, "Failed to get %zd samples from read factory %p\n", 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 */




More information about the asterisk-commits mailing list