dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@130237 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
mmichelson 2008-07-11 20:03:55 +00:00
parent 5e34d71fb5
commit 084d639948
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/audiohook.c
View File

@ -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 */