kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-14 09:58:17 +00:00
Code Issues Projects Releases Wiki Activity

FS-10802: [mod_conference] Convert conference floor to id based

Browse Source
This commit is contained in:
Anthony Minessale
2017-11-27 12:56:51 -06:00
committed by Muteesa Fred
parent 376cc03f58
commit 86ae01462a
5 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mod/applications/mod_conference/conference_api.c
View File

@@ -2046,6 +2046,14 @@ switch_status_t conference_api_sub_floor(conference_member_t *member, switch_str
if (member == NULL)
return SWITCH_STATUS_GENERR;
if (conference_utils_member_test_flag(member, MFLAG_DED_VID_LAYER)) {
if (stream != NULL) {
stream->write_function(stream, "-ERR cannot set floor on a member in an active video role\n");
}
return SWITCH_STATUS_SUCCESS;
}
if (member->conference->floor_holder == member->id) {
conference_member_set_floor_holder(member->conference, NULL, 0);
if (stream != NULL) {
@@ -2358,6 +2366,14 @@ switch_status_t conference_api_sub_vid_floor(conference_member_t *member, switch
return SWITCH_STATUS_FALSE;
}
if (conference_utils_member_test_flag(member, MFLAG_DED_VID_LAYER)) {
if (stream != NULL) {
stream->write_function(stream, "-ERR cannot set floor on a member in an active video role\n");
}
return SWITCH_STATUS_SUCCESS;
}
if (data && switch_stristr("force", (char *) data)) {
force = 1;
}