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

don't mix personal canvas and multi-canvas modes

This commit is contained in:
Anthony Minessale 2015-08-06 19:08:31 -05:00
parent b3c248048e
commit c38a0f33a4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3125,6 +3125,11 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
if (video_canvas_count < 1) video_canvas_count = 1; if (video_canvas_count < 1) video_canvas_count = 1;
if (conference_utils_test_flag(conference, CFLAG_PERSONAL_CANVAS) && video_canvas_count) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Personal Canvas and Multi-Canvas modes are not compatable. 1 canvas will be used.\n");
video_canvas_count = 1;
}
if (conference->conference_video_mode == CONF_VIDEO_MODE_MUX) { if (conference->conference_video_mode == CONF_VIDEO_MODE_MUX) {
video_layout_t *vlayout = conference_video_get_layout(conference, conference->video_layout_name, conference->video_layout_group); video_layout_t *vlayout = conference_video_get_layout(conference, conference->video_layout_name, conference->video_layout_group);