mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-07 02:18:15 +00:00
Merged revisions 130174 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r130174 | mmichelson | 2008-07-11 14:14:15 -0500 (Fri, 11 Jul 2008) | 15 lines Merged revisions 130173 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r130173 | mmichelson | 2008-07-11 14:13:29 -0500 (Fri, 11 Jul 2008) | 7 lines Fix a typo in audiohook_read_frame_both. While this change has not been proven to fix any specific issue, it is incorrect and could cause unforeseen problems. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -207,7 +207,7 @@ static struct ast_frame *audiohook_read_frame_both(struct ast_audiohook *audioho
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* If we want to provide only a write factory make sure we aren't waiting for other audio */
|
/* If we want to provide only a write factory make sure we aren't waiting for other audio */
|
||||||
if (usable_write && !usable_read && (ast_tvdiff_ms(ast_tvnow(), audiohook->write_time) < (samples/8)*2)) {
|
if (usable_write && !usable_read && (ast_tvdiff_ms(ast_tvnow(), audiohook->read_time) < (samples/8)*2)) {
|
||||||
ast_debug(1, "Read factory %p was pretty quick last time, waiting for them.\n", &audiohook->read_factory);
|
ast_debug(1, "Read factory %p was pretty quick last time, waiting for them.\n", &audiohook->read_factory);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user