[asterisk-commits] file: trunk r427847 - in /trunk: ./ apps/confbridge/conf_state_multi_marked.c

[SVN commits to the Asterisk project]

Author: file
Date: Fri Nov 14 08:56:53 2014
New Revision: 427847

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=427847
Log:
app_confbridge: Play "leader has left" sound even when musiconhold is enabled.

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
........

Merged revisions 427846 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/apps/confbridge/conf_state_multi_marked.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/apps/confbridge/conf_state_multi_marked.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/confbridge/conf_state_multi_marked.c?view=diff&rev=427847&r1=427846&r2=427847
==============================================================================
--- trunk/apps/confbridge/conf_state_multi_marked.c (original)
+++ trunk/apps/confbridge/conf_state_multi_marked.c Fri Nov 14 08:56:53 2014
@@ -107,12 +107,6 @@
 				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 @@
 			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);
+		}
 	}
 }