kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-7513 favor moderators for selection of open layers in the canvas

This commit is contained in:
Anthony Minessale 2015-05-13 14:42:26 -05:00 committed by Michael Jerris
parent 9e07bfb23d
commit 4e141d0e51
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod/applications/mod_conference/mod_conference.c
View File

@ -2056,13 +2056,14 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
for (i = 0; i < conference->canvas->total_layers; i++) {
mcu_layer_t *xlayer = &conference->canvas->layers[i];
if (xlayer->is_avatar && xlayer->member_id != conference->video_floor_holder) {
if (xlayer->is_avatar && xlayer->member_id != conference->video_floor_holder && !switch_test_flag(imember, MFLAG_MOD)) {
avatar_layers++;
}
}
if (!layer && (conference->canvas->layers_used < conference->canvas->total_layers ||
(avatar_layers && !imember->avatar_png_img)) &&
if (!layer &&
(conference->canvas->layers_used < conference->canvas->total_layers ||
(avatar_layers && !imember->avatar_png_img) || switch_test_flag(imember, MFLAG_MOD)) &&
(imember->avatar_png_img || imember->video_flow != SWITCH_MEDIA_FLOW_SENDONLY)) {
/* find an empty layer */
for (i = 0; i < conference->canvas->total_layers; i++) {