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: https://origsvn.digium.com/svn/asterisk/trunk@47240 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 72afed5d738bbdab7175257dc5a6179d40a7ac28..90bc47a62c3e1f355100ad219b27ec39c679b0f7 100644 (file)
--- 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;