Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
704c0365
提交
704c0365
authored
2月 14, 2015
作者:
Anthony Minessale
提交者:
Michael Jerris
5月 28, 2015
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-7513: change name of flag to make sense
上级
e65f6bd6
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
12 行增加
和
12 行删除
+12
-12
mod_conference.c
src/mod/applications/mod_conference/mod_conference.c
+12
-12
没有找到文件。
src/mod/applications/mod_conference/mod_conference.c
浏览文件 @
704c0365
...
...
@@ -224,7 +224,7 @@ typedef enum {
MFLAG_NO_POSITIONAL = (1 << 27),
MFLAG_JOIN_VID_FLOOR = (1 << 28),
MFLAG_RECEIVING_VIDEO = (1 << 29),
MFLAG_CAN_
SEE
= (1 << 30)
MFLAG_CAN_
BE_SEEN
= (1 << 30)
} member_flag_t;
typedef enum {
...
...
@@ -1673,7 +1673,7 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
if (layer) {
switch_img_free(&layer->cur_img);
if (switch_test_flag(imember, MFLAG_CAN_
SEE
)) {
if (switch_test_flag(imember, MFLAG_CAN_
BE_SEEN
)) {
layer->mute_patched = 0;
} else {
switch_img_free(&img);
...
...
@@ -2936,7 +2936,7 @@ static switch_status_t conference_add_event_member_data(conference_member_t *mem
}
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Hear", "%s", switch_test_flag(member, MFLAG_CAN_HEAR) ? "true" : "false" );
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "See", "%s", switch_test_flag(member, MFLAG_CAN_
SEE
) ? "true" : "false" );
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "See", "%s", switch_test_flag(member, MFLAG_CAN_
BE_SEEN
) ? "true" : "false" );
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Speak", "%s", switch_test_flag(member, MFLAG_CAN_SPEAK) ? "true" : "false" );
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Talking", "%s", switch_test_flag(member, MFLAG_TALKING) ? "true" : "false" );
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Mute-Detect", "%s", switch_test_flag(member, MFLAG_MUTE_DETECT) ? "true" : "false" );
...
...
@@ -3310,7 +3310,7 @@ static void member_update_status_field(conference_member_t *member)
}
if (switch_channel_test_flag(member->channel, CF_VIDEO)) {
if (!switch_test_flag(member, MFLAG_CAN_
SEE
)) {
if (!switch_test_flag(member, MFLAG_CAN_
BE_SEEN
)) {
vstr = " VIDEO (BLIND)";
} else {
vstr = " VIDEO";
...
...
@@ -4966,7 +4966,7 @@ static void conference_loop_fn_vmute_toggle(conference_member_t *member, caller_
if (member == NULL)
return;
if (switch_test_flag(member, MFLAG_CAN_
SEE
)) {
if (switch_test_flag(member, MFLAG_CAN_
BE_SEEN
)) {
conf_api_sub_vmute(member, NULL, NULL);
} else {
conf_api_sub_unvmute(member, NULL, NULL);
...
...
@@ -4975,14 +4975,14 @@ static void conference_loop_fn_vmute_toggle(conference_member_t *member, caller_
static void conference_loop_fn_vmute_on(conference_member_t *member, caller_control_action_t *action)
{
if (switch_test_flag(member, MFLAG_CAN_
SEE
)) {
if (switch_test_flag(member, MFLAG_CAN_
BE_SEEN
)) {
conf_api_sub_vmute(member, NULL, NULL);
}
}
static void conference_loop_fn_vmute_off(conference_member_t *member, caller_control_action_t *action)
{
if (!switch_test_flag(member, MFLAG_CAN_
SEE
)) {
if (!switch_test_flag(member, MFLAG_CAN_
BE_SEEN
)) {
conf_api_sub_unvmute(member, NULL, NULL);
}
}
...
...
@@ -7634,7 +7634,7 @@ static switch_status_t conf_api_sub_vmute(conference_member_t *member, switch_st
if (member == NULL)
return SWITCH_STATUS_GENERR;
switch_clear_flag_locked(member, MFLAG_CAN_
SEE
);
switch_clear_flag_locked(member, MFLAG_CAN_
BE_SEEN
);
if (!(data) || !strstr((char *) data, "quiet")) {
switch_set_flag(member, MFLAG_INDICATE_MUTE);
...
...
@@ -7663,7 +7663,7 @@ static switch_status_t conf_api_sub_tvmute(conference_member_t *member, switch_s
if (member == NULL)
return SWITCH_STATUS_GENERR;
if (switch_test_flag(member, MFLAG_CAN_
SEE
)) {
if (switch_test_flag(member, MFLAG_CAN_
BE_SEEN
)) {
return conf_api_sub_vmute(member, stream, data);
}
...
...
@@ -7678,7 +7678,7 @@ static switch_status_t conf_api_sub_unvmute(conference_member_t *member, switch_
if (member == NULL)
return SWITCH_STATUS_GENERR;
switch_set_flag_locked(member, MFLAG_CAN_
SEE
);
switch_set_flag_locked(member, MFLAG_CAN_
BE_SEEN
);
if (!(data) || !strstr((char *) data, "quiet")) {
switch_set_flag(member, MFLAG_INDICATE_UNMUTE);
...
...
@@ -10468,7 +10468,7 @@ static void set_mflags(const char *flags, member_flag_t *f)
char *argv[10] = { 0 };
int i, argc = 0;
*f |= MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR | MFLAG_CAN_
SEE
;
*f |= MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR | MFLAG_CAN_
BE_SEEN
;
for (p = dup; p && *p; p++) {
if (*p == ',') {
...
...
@@ -12102,7 +12102,7 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_c
conference->perpetual_sound = switch_core_strdup(conference->pool, perpetual_sound);
}
conference->mflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR | MFLAG_CAN_
SEE
;
conference->mflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR | MFLAG_CAN_
BE_SEEN
;
if (!zstr(moh_sound) && switch_is_moh(moh_sound)) {
conference->moh_sound = switch_core_strdup(conference->pool, moh_sound);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论