kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 11:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app_confbridge.c: Replace inlined code with existing function." into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-02-05 11:49:38 -06:00
committed by Gerrit Code Review
parent 2177dbea50 ed3c9c1512
commit c9e1c203b5
1 changed files with 26 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
apps/app_confbridge.c
View File

@@ -1086,6 +1086,31 @@ void conf_update_user_mute(struct confbridge_user *user)
ast_channel_name(user->chan)); ast_channel_name(user->chan));
} }
/*
* \internal
* \brief Mute/unmute a single user.
*/
static void generic_mute_unmute_user(struct confbridge_conference *conference, struct confbridge_user *user, int mute)
{
/* Set user level mute request. */
user->muted = mute ? 1 : 0;
conf_update_user_mute(user);
ast_test_suite_event_notify("CONF_MUTE",
"Message: participant %s %s\r\n"
"Conference: %s\r\n"
"Channel: %s",
ast_channel_name(user->chan),
mute ? "muted" : "unmuted",
conference->b_profile.name,
ast_channel_name(user->chan));
if (mute) {
send_mute_event(user, conference);
} else {
send_unmute_event(user, conference);
}
}
void conf_moh_stop(struct confbridge_user *user) void conf_moh_stop(struct confbridge_user *user)
{ {
user->playing_moh = 0; user->playing_moh = 0;
@@ -1922,22 +1947,7 @@ static int action_toggle_mute(struct confbridge_conference *conference,
/* Toggle user level mute request. */ /* Toggle user level mute request. */
mute = !user->muted; mute = !user->muted;
user->muted = mute; generic_mute_unmute_user(conference, user, mute);
conf_update_user_mute(user);
ast_test_suite_event_notify("CONF_MUTE",
"Message: participant %s %s\r\n"
"Conference: %s\r\n"
"Channel: %s",
ast_channel_name(user->chan),
mute ? "muted" : "unmuted",
user->b_profile.name,
ast_channel_name(user->chan));
if (mute) {
send_mute_event(user, conference);
} else {
send_unmute_event(user, conference);
}
return play_file(bridge_channel, NULL, (mute ? return play_file(bridge_channel, NULL, (mute ?
conf_get_sound(CONF_SOUND_MUTED, user->b_profile.sounds) : conf_get_sound(CONF_SOUND_MUTED, user->b_profile.sounds) :
@@ -2551,30 +2561,6 @@ static int generic_lock_unlock_helper(int lock, const char *conference_name)
return res; return res;
} }
/* \internal
* \brief Mute/unmute a single user.
*/
static void generic_mute_unmute_user(struct confbridge_conference *conference, struct confbridge_user *user, int mute)
{
/* Set user level mute request. */
user->muted = mute ? 1 : 0;
conf_update_user_mute(user);
ast_test_suite_event_notify("CONF_MUTE",
"Message: participant %s %s\r\n"
"Conference: %s\r\n"
"Channel: %s",
ast_channel_name(user->chan),
mute ? "muted" : "unmuted",
conference->b_profile.name,
ast_channel_name(user->chan));
if (mute) {
send_mute_event(user, conference);
} else {
send_unmute_event(user, conference);
}
}
/* \internal /* \internal
* \brief finds a conference user by channel name and mutes/unmutes them. * \brief finds a conference user by channel name and mutes/unmutes them.
* *