From ec482339b73cc348ac111895f689191f62eb3395 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Fri, 11 Jul 2008 20:04:25 +0000 Subject: [PATCH] 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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130238 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/audiohook.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/audiohook.c b/main/audiohook.c index 0694e57781..f4bbc8b39a 100644 --- a/main/audiohook.c +++ b/main/audiohook.c @@ -213,7 +213,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 */ @@ -232,7 +232,7 @@ static struct ast_frame *audiohook_read_frame_both(struct ast_audiohook *audioho 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 */