提交 51185079 authored 作者: Mike Jerris's avatar Mike Jerris

Merge pull request #365 in FS/freeswitch from ~THEHUNMONKGROUP/freeswitch:FS-7882 to master

* commit '1d7a4968':
  Allow JSON API commands to send third arg for muting
...@@ -99,15 +99,19 @@ void conference_event_mod_channel_handler(const char *event_channel, cJSON *json ...@@ -99,15 +99,19 @@ void conference_event_mod_channel_handler(const char *event_channel, cJSON *json
SWITCH_STANDARD_STREAM(stream); SWITCH_STANDARD_STREAM(stream);
if (!strcasecmp(action, "kick") || if (!strcasecmp(action, "kick")) {
!strcasecmp(action, "mute") || exec = switch_mprintf("%s %s %s", conference_name, action, cid);
} else if (!strcasecmp(action, "mute") ||
!strcasecmp(action, "unmute") || !strcasecmp(action, "unmute") ||
!strcasecmp(action, "tmute") || !strcasecmp(action, "tmute") ||
!strcasecmp(action, "vmute") || !strcasecmp(action, "vmute") ||
!strcasecmp(action, "unvmute") || !strcasecmp(action, "unvmute") ||
!strcasecmp(action, "tvmute") !strcasecmp(action, "tvmute")) {
) { if (argv[0]) {
exec = switch_mprintf("%s %s %s", conference_name, action, cid); exec = switch_mprintf("%s %s %s %s", conference_name, action, cid, argv[0]);
} else {
exec = switch_mprintf("%s %s %s", conference_name, action, cid);
}
} else if (!strcasecmp(action, "volume_in") || } else if (!strcasecmp(action, "volume_in") ||
!strcasecmp(action, "volume_out") || !strcasecmp(action, "volume_out") ||
!strcasecmp(action, "vid-res-id") || !strcasecmp(action, "vid-res-id") ||
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论