Skip to content
Snippets Groups Projects
Commit 1a7806c8 authored by Mark Michelson's avatar Mark Michelson
Browse files

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/trunk@130237 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent caf226d5
No related branches found
No related tags found
No related merge requests found
......@@ -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 */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment