]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Remove redundant logic
authorMark Michelson <mmichelson@digium.com>
Fri, 11 Jul 2008 20:03:23 +0000 (20:03 +0000)
committerMark Michelson <mmichelson@digium.com>
Fri, 11 Jul 2008 20:03:23 +0000 (20:03 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@130236 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/audiohook.c

index e02c933c8c06cbedfe15daa7cae8045e5b1ca6c3..32d1f05cdb9e065a31418afd14c15b6f6714f570 100644 (file)
@@ -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 */