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

clear talk flag when you mute

上级 9c4c1e81
...@@ -3549,6 +3549,9 @@ static switch_status_t conf_api_sub_mute(conference_member_t *member, switch_str ...@@ -3549,6 +3549,9 @@ static switch_status_t conf_api_sub_mute(conference_member_t *member, switch_str
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
switch_clear_flag_locked(member, MFLAG_CAN_SPEAK); switch_clear_flag_locked(member, MFLAG_CAN_SPEAK);
switch_clear_flag_locked(member, MFLAG_TALKING);
if (!zstr(member->conference->muted_sound)) { if (!zstr(member->conference->muted_sound)) {
conference_member_play_file(member, member->conference->muted_sound, 0); conference_member_play_file(member, member->conference->muted_sound, 0);
} else { } else {
...@@ -4344,6 +4347,7 @@ static switch_status_t conf_api_sub_relate(conference_obj_t *conference, switch_ ...@@ -4344,6 +4347,7 @@ static switch_status_t conf_api_sub_relate(conference_obj_t *conference, switch_
switch_set_flag(rel, RFLAG_CAN_SPEAK | RFLAG_CAN_HEAR); switch_set_flag(rel, RFLAG_CAN_SPEAK | RFLAG_CAN_HEAR);
if (nospeak) { if (nospeak) {
switch_clear_flag(rel, RFLAG_CAN_SPEAK); switch_clear_flag(rel, RFLAG_CAN_SPEAK);
switch_clear_flag_locked(member, MFLAG_TALKING);
} }
if (nohear) { if (nohear) {
switch_clear_flag(rel, RFLAG_CAN_HEAR); switch_clear_flag(rel, RFLAG_CAN_HEAR);
...@@ -5279,6 +5283,7 @@ static void set_mflags(const char *flags, member_flag_t *f) ...@@ -5279,6 +5283,7 @@ static void set_mflags(const char *flags, member_flag_t *f)
for (i = 0; i < argc && argv[i]; i++) { for (i = 0; i < argc && argv[i]; i++) {
if (!strcasecmp(argv[i], "mute")) { if (!strcasecmp(argv[i], "mute")) {
*f &= ~MFLAG_CAN_SPEAK; *f &= ~MFLAG_CAN_SPEAK;
*f &= ~MFLAG_TALKING;
} else if (!strcasecmp(argv[i], "deaf")) { } else if (!strcasecmp(argv[i], "deaf")) {
*f &= ~MFLAG_CAN_HEAR; *f &= ~MFLAG_CAN_HEAR;
} else if (!strcasecmp(argv[i], "waste")) { } else if (!strcasecmp(argv[i], "waste")) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论