Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

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

Browse Source 
* commit '1d7a496889dcf1dbb4cb9bb40a3b4b449cdfd60a':
  Allow JSON API commands to send third arg for muting
This commit is contained in:
Mike Jerris 2015-07-24 10:32:32 -05:00
commit 51185079c2
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod/applications/mod_conference/conference_event.c
View File

@ -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") ||