kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-03 09:21:29 +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 18:07:22 -06:00 committed by Muteesa Fred
parent 86ae01462a
commit 6bd169abc2
1 changed files with 5 additions and 3 deletions

8
src/mod/applications/mod_conference/conference_video.c

@ -1031,6 +1031,8 @@ void conference_video_detach_video_layer(conference_member_t *member)
if (member->canvas_id < 0) return; if (member->canvas_id < 0) return;
conference_utils_member_clear_flag(member, MFLAG_DED_VID_LAYER);
if (!(canvas = conference_video_get_canvas_locked(member))) { if (!(canvas = conference_video_get_canvas_locked(member))) {
return; return;
} }
@ -1080,8 +1082,6 @@ void conference_video_detach_video_layer(conference_member_t *member)
conference_video_set_canvas_bgimg(canvas, NULL); conference_video_set_canvas_bgimg(canvas, NULL);
} }
conference_utils_member_clear_flag(member, MFLAG_DED_VID_LAYER);
end: end:
switch_mutex_unlock(canvas->mutex); switch_mutex_unlock(canvas->mutex);
@ -1545,9 +1545,11 @@ void conference_video_init_canvas_layers(conference_obj_t *conference, mcu_canva
mcu_layer_t *layer = &canvas->layers[i]; mcu_layer_t *layer = &canvas->layers[i];
if (layer->member) { if (layer->member) {
//conference_video_detach_video_layer(layer->member);
conference_video_clear_managed_kps(layer->member); conference_video_clear_managed_kps(layer->member);
layer->member->video_layer_id = -1; layer->member->video_layer_id = -1;
conference_video_detach_video_layer(layer->member);
layer->member = NULL; layer->member = NULL;
} }
layer->member_id = 0; layer->member_id = 0;