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

MoH: Don't restart stream on repeated start calls

Browse Source 
Currently, music on hold will stop and then start again from the
beginning if ast_moh_start() is called multiple times. This can happen
if a call is put on hold repeatedly (the channel receives multiple
HOLD control frames) and can be triggered from ARI by starting MoH on a
channel multiple times. This is fairly jarring/annoying to users.

This change prevents MoH from being restarted if the requested music
class is the same as the one currently playing.

Review: https://reviewboard.asterisk.org/r/3615/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@416150 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2014-06-13 13:03:35 +00:00
parent 1509ae5779
commit 4707dd1ce5
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_musiconhold.c
View File

@@ -1320,7 +1320,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
struct mohclass *mohclass = NULL; struct mohclass *mohclass = NULL;
struct moh_files_state *state = chan->music_state; struct moh_files_state *state = chan->music_state;
struct ast_variable *var = NULL; struct ast_variable *var = NULL;
int res; int res = 0;
int realtime_possible = ast_check_realtime("musiconhold"); int realtime_possible = ast_check_realtime("musiconhold");
/* The following is the order of preference for which class to use: /* The following is the order of preference for which class to use:
@@ -1518,10 +1518,12 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
ast_set_flag(chan, AST_FLAG_MOH); ast_set_flag(chan, AST_FLAG_MOH);
if (mohclass->total_files) { if (!state || strcmp(mohclass->name, state->class->name)) {
res = ast_activate_generator(chan, &moh_file_stream, mohclass); if (mohclass->total_files) {
} else { res = ast_activate_generator(chan, &moh_file_stream, mohclass);
res = ast_activate_generator(chan, &mohgen, mohclass); } else {
res = ast_activate_generator(chan, &mohgen, mohclass);
}
} }
mohclass = mohclass_unref(mohclass, "unreffing local reference to mohclass in local_ast_moh_start"); mohclass = mohclass_unref(mohclass, "unreffing local reference to mohclass in local_ast_moh_start");