diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-27 17:15:54 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-27 17:15:54 +0000 |
commit | e65feea0fab3b7c88cee1ffbb96a30cbe448d0f2 (patch) | |
tree | 005461283c7d88e781473ca6bd701752df689ffe /res | |
parent | 5344383ca6354955f5c38760b0bc340549a9b259 (diff) |
Random MOH wasn't really random (bug 8381)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@48045 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/res_musiconhold.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index b9b7b8f17..ccc618257 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -190,7 +190,7 @@ static void moh_files_release(struct ast_channel *chan, void *data) if (state->origwfmt && ast_set_write_format(chan, state->origwfmt)) { ast_log(LOG_WARNING, "Unable to restore channel '%s' to format '%d'\n", chan->name, state->origwfmt); } - state->save_pos = state->pos + 1; + state->save_pos = state->pos; } } @@ -201,32 +201,29 @@ static int ast_moh_files_next(struct ast_channel *chan) int tries; if (state->save_pos) { - state->pos = state->save_pos - 1; + state->pos = state->save_pos; state->save_pos = 0; - } else { - /* Try 20 times to find something good */ - for (tries=0;tries < 20;tries++) { - state->samples = 0; - if (chan->stream) { - ast_closestream(chan->stream); - chan->stream = NULL; - state->pos++; - } + } - if (ast_test_flag(state->class, MOH_RANDOMIZE)) - state->pos = rand(); + state->samples = 0; + if (chan->stream) { + ast_closestream(chan->stream); + chan->stream = NULL; + state->pos++; + state->pos %= state->class->total_files; + } - state->pos %= state->class->total_files; + if (ast_test_flag(state->class, MOH_RANDOMIZE)) { + /* Try 20 times to find something good */ + 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->pos = state->pos % state->class->total_files; - if (!ast_openstream_full(chan, state->class->filearray[state->pos], chan->language, 1)) { ast_log(LOG_WARNING, "Unable to open file '%s': %s\n", state->class->filearray[state->pos], strerror(errno)); state->pos++; |