diff options
author | Joshua Colp <jcolp@digium.com> | 2016-02-05 11:49:38 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-02-05 11:49:39 -0600 |
commit | c9e1c203b5214f0e5670b7eed4952f8a3202bbd7 (patch) | |
tree | 3b4d860962607f7566571084100b7849e2702c53 /apps | |
parent | 2177dbea50749456d909a1625a7aeda3f8c4979f (diff) | |
parent | ed3c9c15126ddd2437bed6d022194fe7d1c90c29 (diff) |
Merge "app_confbridge.c: Replace inlined code with existing function." into 13
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_confbridge.c | 66 |
1 files changed, 26 insertions, 40 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index ad2a511bf..c00fef812 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -1086,6 +1086,31 @@ void conf_update_user_mute(struct confbridge_user *user) 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) { user->playing_moh = 0; @@ -1922,22 +1947,7 @@ static int action_toggle_mute(struct confbridge_conference *conference, /* Toggle user level mute request. */ mute = !user->muted; - user->muted = 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); - } + generic_mute_unmute_user(conference, user, mute); return play_file(bridge_channel, NULL, (mute ? conf_get_sound(CONF_SOUND_MUTED, user->b_profile.sounds) : @@ -2552,30 +2562,6 @@ static int generic_lock_unlock_helper(int lock, const char *conference_name) } /* \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 * \brief finds a conference user by channel name and mutes/unmutes them. * * \retval 0 success |