FS-10448: [mod_conference] Add Video Blind -- add tweak

diff --git a/src/mod/applications/mod_conference/conference_api.c b/src/mod/applications/mod_conference/conference_api.c
index 178fe561b65ee99f5de55ab259aa8aca742a066d..829ddccd962b865b2e6ce91cc202d2f188d4c89d 100644 (file)
--- a/src/mod/applications/mod_conference/conference_api.c
+++ b/src/mod/applications/mod_conference/conference_api.c
@@ -379,7 +379,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");
@@ -512,7 +512,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 aef72e13f1207e9f6f5d5f4d09daa2ccdaec0d0c..5190f9bb78f182058ac43fffd0b44cf8393ad941 100644 (file)
--- a/src/mod/applications/mod_conference/conference_utils.c
+++ b/src/mod/applications/mod_conference/conference_utils.c
@@ -255,8 +255,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 512ba843b70120ce5f6661ebb7996fc3ecfdfd39..aa73faa8f407c782c0eed6987076317bd88fd55c 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.h
+++ b/src/mod/applications/mod_conference/mod_conference.h
@@ -328,9 +328,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),
@@ -349,8 +349,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