From a2e14fc624bd8b964aa327262b9058b90eee733e Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 30 Jun 2017 10:29:00 -0500 Subject: [PATCH] FS-10448: [mod_conference] Add Video Blind -- add tweak --- src/mod/applications/mod_conference/conference_api.c | 4 ++-- src/mod/applications/mod_conference/conference_utils.c | 2 -- src/mod/applications/mod_conference/mod_conference.h | 7 +++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/mod/applications/mod_conference/conference_api.c b/src/mod/applications/mod_conference/conference_api.c index 965f09dc2f..c59e17e716 100644 --- a/src/mod/applications/mod_conference/conference_api.c +++ b/src/mod/applications/mod_conference/conference_api.c @@ -413,7 +413,7 @@ switch_status_t conference_api_sub_unmute(conference_member_t *member, switch_st stream->write_function(stream, "OK unmute %u\n", member->id); } - if (test_eflag(member->conference, EFLAG_UNMUTE_MEMBER) && + if (test_eflag(member->conference, EFLAG_MUTE_MEMBER) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_member_add_event_data(member, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "unmute-member"); @@ -546,7 +546,7 @@ switch_status_t conference_api_sub_unvmute(conference_member_t *member, switch_s stream->write_function(stream, "OK unvmute %u\n", member->id); } - if (test_eflag(member->conference, EFLAG_UNMUTE_MEMBER) && + if (test_eflag(member->conference, EFLAG_MUTE_MEMBER) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_member_add_event_data(member, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "unvmute-member"); diff --git a/src/mod/applications/mod_conference/conference_utils.c b/src/mod/applications/mod_conference/conference_utils.c index 5e6ae06e41..cb8334f654 100644 --- a/src/mod/applications/mod_conference/conference_utils.c +++ b/src/mod/applications/mod_conference/conference_utils.c @@ -251,8 +251,6 @@ void conference_utils_clear_eflags(char *events, uint32_t *f) *f &= ~EFLAG_MUTE_DETECT; } else if (!strcmp(event, "mute-member")) { *f &= ~EFLAG_MUTE_MEMBER; - } else if (!strcmp(event, "unmute-member")) { - *f &= ~EFLAG_UNMUTE_MEMBER; } else if (!strcmp(event, "kick-member")) { *f &= ~EFLAG_KICK_MEMBER; } else if (!strcmp(event, "dtmf-member")) { diff --git a/src/mod/applications/mod_conference/mod_conference.h b/src/mod/applications/mod_conference/mod_conference.h index 71a17815b1..7ac87c9c6e 100644 --- a/src/mod/applications/mod_conference/mod_conference.h +++ b/src/mod/applications/mod_conference/mod_conference.h @@ -326,9 +326,9 @@ typedef enum { EFLAG_STOP_TALKING = (1 << 6), EFLAG_START_TALKING = (1 << 7), EFLAG_MUTE_MEMBER = (1 << 8), - EFLAG_UNMUTE_MEMBER = (1 << 9), + EFLAG_BLIND_MEMBER = (1 << 9), EFLAG_DEAF_MEMBER = (1 << 10), - EFLAG_UNDEAF_MEMBER = (1 << 11), + EFLAG_UNUSED1 = (1 << 11), EFLAG_KICK_MEMBER = (1 << 12), EFLAG_DTMF_MEMBER = (1 << 13), EFLAG_ENERGY_LEVEL_MEMBER = (1 << 14), @@ -347,8 +347,7 @@ typedef enum { EFLAG_RECORD = (1 << 27), EFLAG_HUP_MEMBER = (1 << 28), EFLAG_PLAY_FILE_DONE = (1 << 29), - EFLAG_SET_POSITION_MEMBER = (1 << 30), - EFLAG_BLIND_MEMBER = (int)(1U << 31U) + EFLAG_SET_POSITION_MEMBER = (1 << 30) } event_type_t; #ifdef OPENAL_POSITIONING