From c24b062fd90a2d569686160e52e7149eec3363cc Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Tue, 17 Jun 2014 16:26:10 +0000 Subject: [PATCH] MoH: Don't restart stream on repeated start calls 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. This includes an extra check to prevent the errors previously experienced in the testsuite and has 100+ test runs behind it. Review: https://reviewboard.asterisk.org/r/3615/ ........ Merged revisions 416439 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 416440 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@416441 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_musiconhold.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 38e47546e6..290052592f 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1408,7 +1408,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con struct mohclass *mohclass = NULL; struct moh_files_state *state = ast_channel_music_state(chan); struct ast_variable *var = NULL; - int res; + int res = 0; int realtime_possible = ast_check_realtime("musiconhold"); /* The following is the order of preference for which class to use: @@ -1596,10 +1596,12 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con } } - if (mohclass->total_files) { - res = ast_activate_generator(chan, &moh_file_stream, mohclass); - } else { - res = ast_activate_generator(chan, &mohgen, mohclass); + if (!state || !state->class || strcmp(mohclass->name, state->class->name)) { + if (mohclass->total_files) { + res = ast_activate_generator(chan, &moh_file_stream, mohclass); + } else { + res = ast_activate_generator(chan, &mohgen, mohclass); + } } if (!res) { ast_channel_latest_musicclass_set(chan, mohclass->name); -- 2.47.2