kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

(closes issue #10419)

Browse Source 
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/branches/1.4@81042 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-08-27 16:16:25 +00:00
parent 7a47ac4960
commit 6e01a4ddaf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/res_musiconhold.c
View File

@@ -118,8 +118,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)
@@ -215,7 +215,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);
}
@@ -232,9 +232,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++) {