[asterisk-commits] rmudgett: branch rmudgett/bridge_tasks r402441 - /team/rmudgett/bridge_tasks/...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Sat Nov  2 00:08:01 2013
New Revision: 402441

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402441
Log:
Replace some inlined code with functions.

Modified:
    team/rmudgett/bridge_tasks/apps/confbridge/conf_state_multi_marked.c

Modified: team/rmudgett/bridge_tasks/apps/confbridge/conf_state_multi_marked.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_tasks/apps/confbridge/conf_state_multi_marked.c?view=diff&rev=402441&r1=402440&r2=402441
==============================================================================
--- team/rmudgett/bridge_tasks/apps/confbridge/conf_state_multi_marked.c (original)
+++ team/rmudgett/bridge_tasks/apps/confbridge/conf_state_multi_marked.c Sat Nov  2 00:08:01 2013
@@ -99,10 +99,8 @@
 			if (ast_test_flag(&user_iter->u_profile, USER_OPT_ENDMARKED)) {
 				if (ast_test_flag(&user_iter->u_profile, USER_OPT_WAITMARKED)
 					&& !ast_test_flag(&user_iter->u_profile, USER_OPT_MARKEDUSER)) {
-					AST_LIST_REMOVE_CURRENT(list);
-					user_iter->conference->activeusers--;
-					AST_LIST_INSERT_TAIL(&user_iter->conference->waiting_list, user_iter, list);
-					user_iter->conference->waitingusers++;
+					conf_remove_user_active(user_iter->conference, user_iter);
+					conf_add_user_waiting(user_iter->conference, user_iter);
 				}
 				user_iter->kicked = 1;
 				ast_bridge_remove(user_iter->conference->bridge, user_iter->chan);