提交 aec11b09 authored 作者: Anthony Minessale's avatar Anthony Minessale

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

上级 9c8cf40a
...@@ -379,7 +379,7 @@ switch_status_t conference_api_sub_unmute(conference_member_t *member, switch_st ...@@ -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); 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) { switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
conference_member_add_event_data(member, event); conference_member_add_event_data(member, event);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "unmute-member"); 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 ...@@ -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); 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) { switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
conference_member_add_event_data(member, event); conference_member_add_event_data(member, event);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "unvmute-member"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "unvmute-member");
......
...@@ -255,8 +255,6 @@ void conference_utils_clear_eflags(char *events, uint32_t *f) ...@@ -255,8 +255,6 @@ void conference_utils_clear_eflags(char *events, uint32_t *f)
*f &= ~EFLAG_MUTE_DETECT; *f &= ~EFLAG_MUTE_DETECT;
} else if (!strcmp(event, "mute-member")) { } else if (!strcmp(event, "mute-member")) {
*f &= ~EFLAG_MUTE_MEMBER; *f &= ~EFLAG_MUTE_MEMBER;
} else if (!strcmp(event, "unmute-member")) {
*f &= ~EFLAG_UNMUTE_MEMBER;
} else if (!strcmp(event, "kick-member")) { } else if (!strcmp(event, "kick-member")) {
*f &= ~EFLAG_KICK_MEMBER; *f &= ~EFLAG_KICK_MEMBER;
} else if (!strcmp(event, "dtmf-member")) { } else if (!strcmp(event, "dtmf-member")) {
......
...@@ -328,9 +328,9 @@ typedef enum { ...@@ -328,9 +328,9 @@ typedef enum {
EFLAG_STOP_TALKING = (1 << 6), EFLAG_STOP_TALKING = (1 << 6),
EFLAG_START_TALKING = (1 << 7), EFLAG_START_TALKING = (1 << 7),
EFLAG_MUTE_MEMBER = (1 << 8), EFLAG_MUTE_MEMBER = (1 << 8),
EFLAG_UNMUTE_MEMBER = (1 << 9), EFLAG_BLIND_MEMBER = (1 << 9),
EFLAG_DEAF_MEMBER = (1 << 10), EFLAG_DEAF_MEMBER = (1 << 10),
EFLAG_UNDEAF_MEMBER = (1 << 11), EFLAG_UNUSED1 = (1 << 11),
EFLAG_KICK_MEMBER = (1 << 12), EFLAG_KICK_MEMBER = (1 << 12),
EFLAG_DTMF_MEMBER = (1 << 13), EFLAG_DTMF_MEMBER = (1 << 13),
EFLAG_ENERGY_LEVEL_MEMBER = (1 << 14), EFLAG_ENERGY_LEVEL_MEMBER = (1 << 14),
...@@ -349,8 +349,7 @@ typedef enum { ...@@ -349,8 +349,7 @@ typedef enum {
EFLAG_RECORD = (1 << 27), EFLAG_RECORD = (1 << 27),
EFLAG_HUP_MEMBER = (1 << 28), EFLAG_HUP_MEMBER = (1 << 28),
EFLAG_PLAY_FILE_DONE = (1 << 29), EFLAG_PLAY_FILE_DONE = (1 << 29),
EFLAG_SET_POSITION_MEMBER = (1 << 30), EFLAG_SET_POSITION_MEMBER = (1 << 30)
EFLAG_BLIND_MEMBER = (int)(1U << 31U)
} event_type_t; } event_type_t;
#ifdef OPENAL_POSITIONING #ifdef OPENAL_POSITIONING
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论