mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-31 10:47:18 +00:00
de3dc17cc5
When MOH is playing to a user in a conference and the user is kicked or hangs up from the conference then the AMI MusicOnHoldStop events didn't happen. (Asterisk v11 AMI event: MusicOnHold, state:Stop) (closes issue ASTERISK-23311) Reported by: Benjamin Keith Ford Review: https://reviewboard.asterisk.org/r/3306/ ........ Merged revisions 410490 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 410491 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410492 65c4cc65-6c06-0410-ace0-fbb531ad65f3
85 lines
2.3 KiB
C
85 lines
2.3 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 SINGLE_MARKED state
|
|
*
|
|
* \author\verbatim Terry Wilson <twilson@digium.com> \endverbatim
|
|
*
|
|
* \ingroup applications
|
|
*/
|
|
|
|
/*** MODULEINFO
|
|
<support_level>core</support_level>
|
|
***/
|
|
|
|
#include "include/confbridge.h"
|
|
#include "include/conf_state.h"
|
|
|
|
static void join_active(struct confbridge_user *user);
|
|
static void join_marked(struct confbridge_user *user);
|
|
static void leave_marked(struct confbridge_user *user);
|
|
static void transition_to_single_marked(struct confbridge_user *user);
|
|
|
|
struct confbridge_state STATE_SINGLE_MARKED = {
|
|
.name = "SINGLE_MARKED",
|
|
.join_unmarked = join_active,
|
|
.join_waitmarked = join_active,
|
|
.join_marked = join_marked,
|
|
.leave_marked = leave_marked,
|
|
.entry = transition_to_single_marked,
|
|
};
|
|
struct confbridge_state *CONF_STATE_SINGLE_MARKED = &STATE_SINGLE_MARKED;
|
|
|
|
static void join_active(struct confbridge_user *user)
|
|
{
|
|
conf_add_user_active(user->conference, user);
|
|
conf_handle_second_active(user->conference);
|
|
conf_update_user_mute(user);
|
|
|
|
conf_change_state(user, CONF_STATE_MULTI_MARKED);
|
|
}
|
|
|
|
static void join_marked(struct confbridge_user *user)
|
|
{
|
|
conf_add_user_marked(user->conference, user);
|
|
conf_handle_second_active(user->conference);
|
|
conf_update_user_mute(user);
|
|
|
|
conf_change_state(user, CONF_STATE_MULTI_MARKED);
|
|
}
|
|
|
|
static void leave_marked(struct confbridge_user *user)
|
|
{
|
|
conf_remove_user_marked(user->conference, user);
|
|
if (user->playing_moh) {
|
|
conf_moh_stop(user);
|
|
}
|
|
|
|
conf_change_state(user, CONF_STATE_EMPTY);
|
|
}
|
|
|
|
static void transition_to_single_marked(struct confbridge_user *user)
|
|
{
|
|
conf_mute_only_active(user->conference);
|
|
}
|