From e23538696e45d797a94e287da9c442bc2847f342 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 27 Aug 2007 16:16:56 +0000 Subject: Merged revisions 81042 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81042 | russell | 2007-08-27 11:16:25 -0500 (Mon, 27 Aug 2007) | 11 lines (closes issue #10419) Reported by: mustardman Patches: asterisk-mohposition.diff.txt uploaded by jamesgolovich (license 176) This patch fixes a few problems with music on hold. * Fix issues with starting at the beginning of a file when it shouldn't. * Fix the inuse counter to be decremented even if the class had not been set to be deleted when not in use anymore * Don't arbitrarily limit the number of MOH files to 255 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81043 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_musiconhold.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'res') diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 2badd520c..047cf3cce 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -117,8 +117,8 @@ struct moh_files_state { int origwfmt; int samples; int sample_queue; - unsigned char pos; - unsigned char save_pos; + int pos; + int save_pos; }; #define MOH_QUIET (1 << 0) @@ -214,7 +214,7 @@ static void moh_files_release(struct ast_channel *chan, void *data) } state->save_pos = state->pos; } - if (state->class->delete && ast_atomic_dec_and_test(&state->class->inuse)) + if (ast_atomic_dec_and_test(&state->class->inuse) && state->class->delete) ast_moh_destroy_one(state->class); } @@ -231,9 +231,9 @@ static int ast_moh_files_next(struct ast_channel *chan) } /* If a specific file has been saved, use it */ - if (state->save_pos) { + if (state->save_pos >= 0) { state->pos = state->save_pos; - state->save_pos = 0; + state->save_pos = -1; } 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++) { -- cgit v1.2.3