kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 03:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return previous behavior of having MOH pick up where it was left off. (issue #8672 reported by sinistermidget)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@53084 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-02-01 21:03:10 +00:00
parent f8bed34be9
commit 8ea5a33c9e
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
res/res_musiconhold.c
View File

@@ -203,28 +203,29 @@ static int ast_moh_files_next(struct ast_channel *chan)
struct moh_files_state *state = chan->music_state;
int tries;
if (state->save_pos) {
state->pos = state->save_pos;
state->save_pos = 0;
}
state->samples = 0;
/* Discontinue a stream if it is running already */
if (chan->stream) {
ast_closestream(chan->stream);
chan->stream = NULL;
state->pos++;
state->pos %= state->class->total_files;
}
if (ast_test_flag(state->class, MOH_RANDOMIZE)) {
/* Try 20 times to find something good */
/* If a specific file has been saved, use it */
if (state->save_pos) {
state->pos = state->save_pos;
state->save_pos = 0;
} else if (ast_test_flag(state->class, MOH_RANDOMIZE)) {
/* Get a random file and ensure we can open it */
for (tries = 0; tries < 20; tries++) {
state->pos = rand() % state->class->total_files;
/* check to see if this file's format can be opened */
if (ast_fileexists(state->class->filearray[state->pos], NULL, NULL) > 0)
break;
}
state->samples = 0;
} else {
/* This is easy, just increment our position and make sure we don't exceed the total file count */
state->pos++;
state->pos %= state->class->total_files;
state->samples = 0;
}
if (!ast_openstream_full(chan, state->class->filearray[state->pos], chan->language, 1)) {