kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

app_confbridge: Play "leader has left" sound even when musiconhold is enabled.

Browse Source 
Currently if the leader of a conference bridge leaves any participant
that has musiconhold enabled will not hear the "leader has left" sound.
This is because musiconhold is started and THEN the sound is played.

This change makes it so that the sound is played and THEN musiconhold
is started. This provides a better experience for users as they may not
have known previously why they went back to musiconhold.

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

Merged revisions 427844 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 427845 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@427846 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2014-11-14 14:56:23 +00:00
parent 77c57f2b1a
commit 9067e6faa4
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/confbridge/conf_state_multi_marked.c
View File

@@ -107,12 +107,6 @@ static void leave_marked(struct confbridge_user *user)
user_iter->conference->activeusers--;
AST_LIST_INSERT_TAIL(&user_iter->conference->waiting_list, user_iter, list);
user_iter->conference->waitingusers++;
/* Handle moh of user_iter if necessary */
if (ast_test_flag(&user_iter->u_profile, USER_OPT_MUSICONHOLD)) {
conf_moh_start(user_iter);
}
conf_update_user_mute(user_iter);
}
}
AST_LIST_TRAVERSE_SAFE_END;
@@ -168,6 +162,18 @@ static void leave_marked(struct confbridge_user *user)
ast_autoservice_stop(user->chan);
ao2_lock(user->conference);
}
AST_LIST_TRAVERSE(&user->conference->waiting_list, user_iter, list) {
if (user_iter->kicked) {
continue;
}
if (ast_test_flag(&user_iter->u_profile, USER_OPT_MUSICONHOLD)) {
conf_moh_start(user_iter);
}
conf_update_user_mute(user_iter);
}
}
}