From: Mark Michelson Date: Fri, 11 Jul 2008 20:03:23 +0000 (+0000) Subject: Remove redundant logic X-Git-Tag: 1.4.22-rc1~119 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6d393a0bf072feb9c0f6cae4f713fb8cb5e7c54;p=thirdparty%2Fasterisk.git Remove redundant logic git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@130236 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/audiohook.c b/main/audiohook.c index e02c933c8c..32d1f05cdb 100644 --- a/main/audiohook.c +++ b/main/audiohook.c @@ -223,7 +223,7 @@ static struct ast_frame *audiohook_read_frame_both(struct ast_audiohook *audioho } /* 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 @@ static struct ast_frame *audiohook_read_frame_both(struct ast_audiohook *audioho 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 */