mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +00:00 
			
		
		
		
	struct conference_bridge_user -> struct confbridge_user struct conference_bridge -> struct confbridge_conference struct conference_state -> struct confbridge_state struct conference_bridge_user *conference_bridge_user -> struct confbridge_user *user struct conference_bridge_user *cbu -> struct confbridge_user *user struct conference_bridge *conference_bridge -> struct confbridge_conference *conference The names are now generally shorter, consistently used, and don't conflict with the struct names. This patch handles the renaming part of the issue. (issue ASTERISK-20776) Reported by: rmudgett git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@382764 65c4cc65-6c06-0410-ace0-fbb531ad65f3
		
			
				
	
	
		
			87 lines
		
	
	
		
			2.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			87 lines
		
	
	
		
			2.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Asterisk -- An open source telephony toolkit.
 | |
|  *
 | |
|  * Copyright (C) 2012, Terry Wilson
 | |
|  *
 | |
|  * Terry Wilson <twilson@digium.com>
 | |
|  *
 | |
|  * See http://www.asterisk.org for more information about
 | |
|  * the Asterisk project. Please do not directly contact
 | |
|  * any of the maintainers of this project for assistance;
 | |
|  * the project provides a web site, mailing lists and IRC
 | |
|  * channels for your use.
 | |
|  *
 | |
|  * This program is free software, distributed under the terms of
 | |
|  * the GNU General Public License Version 2. See the LICENSE file
 | |
|  * at the top of the source tree.
 | |
|  *
 | |
|  * Please follow coding guidelines
 | |
|  * http://svn.digium.com/view/asterisk/trunk/doc/CODING-GUIDELINES
 | |
|  */
 | |
| 
 | |
| /*! \file
 | |
|  *
 | |
|  * \brief Confbridge state handling for the EMPTY state
 | |
|  *
 | |
|  * \author\verbatim Terry Wilson <twilson@digium.com> \endverbatim
 | |
|  *
 | |
|  * \ingroup applications
 | |
|  */
 | |
| 
 | |
| /*** MODULEINFO
 | |
| 	<support_level>core</support_level>
 | |
|  ***/
 | |
| 
 | |
| #include "asterisk.h"
 | |
| #include "asterisk/devicestate.h"
 | |
| #include "include/confbridge.h"
 | |
| #include "include/conf_state.h"
 | |
| 
 | |
| static void join_unmarked(struct confbridge_user *user);
 | |
| static void join_waitmarked(struct confbridge_user *user);
 | |
| static void join_marked(struct confbridge_user *user);
 | |
| static void transition_to_empty(struct confbridge_user *user);
 | |
| 
 | |
| struct confbridge_state STATE_EMPTY = {
 | |
| 	.name = "EMPTY",
 | |
| 	.join_unmarked = join_unmarked,
 | |
| 	.join_waitmarked = join_waitmarked,
 | |
| 	.join_marked = join_marked,
 | |
| 	.entry = transition_to_empty,
 | |
| };
 | |
| 
 | |
| struct confbridge_state *CONF_STATE_EMPTY = &STATE_EMPTY;
 | |
| 
 | |
| static void join_unmarked(struct confbridge_user *user)
 | |
| {
 | |
| 	conf_add_user_active(user->conference, user);
 | |
| 	conf_handle_first_join(user->conference);
 | |
| 	conf_add_post_join_action(user, conf_handle_only_unmarked);
 | |
| 
 | |
| 	conf_change_state(user, CONF_STATE_SINGLE);
 | |
| }
 | |
| 
 | |
| static void join_waitmarked(struct confbridge_user *user)
 | |
| {
 | |
| 	conf_default_join_waitmarked(user);
 | |
| 	conf_handle_first_join(user->conference);
 | |
| 
 | |
| 	conf_change_state(user, CONF_STATE_INACTIVE);
 | |
| }
 | |
| 
 | |
| static void join_marked(struct confbridge_user *user)
 | |
| {
 | |
| 	conf_add_user_marked(user->conference, user);
 | |
| 	conf_handle_first_join(user->conference);
 | |
| 	conf_add_post_join_action(user, conf_handle_first_marked_common);
 | |
| 
 | |
| 	conf_change_state(user, CONF_STATE_SINGLE_MARKED);
 | |
| }
 | |
| 
 | |
| static void transition_to_empty(struct confbridge_user *user)
 | |
| {
 | |
| 	/* Set device state to "not in use" */
 | |
| 	ast_devstate_changed(AST_DEVICE_NOT_INUSE, AST_DEVSTATE_CACHABLE, "confbridge:%s", user->conference->name);
 | |
| 	conf_ended(user->conference);
 | |
| }
 |