From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 7 Nov 2006 01:28:08 +0000 (+0000)
Subject: Merged revisions 47239 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89d48b53a2d13d4ae53a59cda18ac7e95b4dc13b;p=thirdparty%2Fasterisk.git

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 72afed5d73..90bc47a62c 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;