sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "res_musiconhold.c: Restart MOH if previous hold just reached end-of-file" into 16

This commit is contained in:
George Joseph 2018-09-14 11:12:40 -05:00 committed by Gerrit Code Review
parent 06d51a0408 ccfd2e0f5d
commit 349355f1f1
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
res/res_musiconhold.c
View File

@ -402,11 +402,28 @@ static int ast_moh_files_next(struct ast_channel *chan)
static struct ast_frame *moh_files_readframe(struct ast_channel *chan)
{
struct ast_frame *f = NULL;
struct ast_frame *f;
if (!(ast_channel_stream(chan) && (f = ast_readframe(ast_channel_stream(chan))))) {
if (!ast_moh_files_next(chan))
f = ast_readframe(ast_channel_stream(chan));
if (!f) {
/* Either there was no file stream setup or we reached EOF. */
if (!ast_moh_files_next(chan)) {
/*
* Either we resetup the previously saved file stream position
* or we started a new file stream.
*/
f = ast_readframe(ast_channel_stream(chan));
if (!f) {
/*
* We can get here if we were very unlucky because the
* resetup file stream was saved at EOF when MOH was
* previously stopped.
*/
if (!ast_moh_files_next(chan)) {
f = ast_readframe(ast_channel_stream(chan));
}
}
}
}
return f;