diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 20:04:25 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 20:04:25 +0000 |
| commit | eece471b6d19e32de871f87b7566c047c9cfd86e (patch) | |
| tree | b8e30234d8ab00d3a78150c1289fb1e9531cedac /main/audiohook.c | |
| parent | 38d2c41fb902a3488f247d182d335d92359d5549 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@130238 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/audiohook.c')
| -rw-r--r-- | main/audiohook.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/audiohook.c b/main/audiohook.c index 0694e5778..f4bbc8b39 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 */ |