kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-20 02:04:54 +00:00
Code Issues Projects Releases Wiki Activity

FS-11149: Playing video files assigned a res_id not correctly updated on layout change

Browse Source 
Regular conference members that are assigned a reservation ID in a layout
are automatically placed in that same reservation ID upon change of a layout.

However, playing files that are assigned a reservation ID are not properly
assigned to the same reservation ID upon layout change.

This patch makes the behavior consistent between the two types.
This commit is contained in:
Chad Phillips 2018-05-08 14:25:51 -07:00
parent 78aec0fe81
commit 1fc0836565
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1662,6 +1662,13 @@ void conference_video_init_canvas_layers(conference_obj_t *conference, mcu_canva
conference_video_set_canvas_bgimg(canvas, conference->video_canvas_bgimg);
}
switch_mutex_lock(conference->file_mutex);
if (conference->fnode && (conference->fnode->canvas_id == canvas->canvas_id || conference->fnode->canvas_id == -1)) {
conference_video_canvas_del_fnode_layer(conference, conference->fnode);
conference_video_fnode_check(conference->fnode, canvas->canvas_id);
}
switch_mutex_unlock(conference->file_mutex);
switch_mutex_unlock(canvas->write_mutex);
switch_mutex_unlock(canvas->mutex);