aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-07 01:28:08 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-07 01:28:08 +0000
commit8c4e2fcf35e1a80e850bb8cfb00ba50d266904d4 (patch)
tree1690384cca80513eea094385b6b6dc5269bfde84 /res
parentd0a6280e3e96e7c7b6b0e372991b1b32468fe6df (diff)
Merged revisions 47239 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r47239 | russell | 2006-11-06 20:25:10 -0500 (Mon, 06 Nov 2006) | 13 lines Merged revisions 47238 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r47238 | russell | 2006-11-06 20:22:58 -0500 (Mon, 06 Nov 2006) | 5 lines If random order is enabled for files mode music on hold, set a random initial position, instead of always starting at the first file, and doing the random operation only when switching to the next file. (bug reported by John Lange on the asterisk-dev mailing list) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47240 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_musiconhold.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 72afed5d7..90bc47a62 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -311,6 +311,8 @@ static void *moh_files_alloc(struct ast_channel *chan, void *params)
/* initialize */
memset(state, 0, sizeof(*state));
state->class = class;
+ if (ast_test_flag(state->class, MOH_RANDOMIZE))
+ state->pos = ast_random() % class->total_files;
}
state->origwfmt = chan->writeformat;