From 2a6990a7e06e2899d733f06302936af8c6344886 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 30 Mar 2018 11:45:02 -0500 Subject: [PATCH] rewind --- .../mod_conference/conference_member.c | 2 +- .../mod_conference/conference_video.c | 23 ++++--------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/mod/applications/mod_conference/conference_member.c b/src/mod/applications/mod_conference/conference_member.c index 274f274c52..5121ee3168 100644 --- a/src/mod/applications/mod_conference/conference_member.c +++ b/src/mod/applications/mod_conference/conference_member.c @@ -1070,7 +1070,7 @@ void conference_member_set_floor_holder(conference_obj_t *conference, conference } if (member && conference_utils_member_test_flag(member, MFLAG_DED_VID_LAYER)) { - goto end; + return; } conference->floor_holder_score_iir = 0; diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index a324cb504f..c1bd8ff425 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -2667,25 +2667,10 @@ switch_status_t conference_video_find_layer(conference_obj_t *conference, mcu_ca void conference_video_next_canvas(conference_member_t *imember) { - int x = 0, y = 0; - - if (imember->conference->canvas_count < 2) { - return; - } - - y = imember->canvas_id; - - for (x = 0; x < imember->conference->canvas_count; x++) { - if (y == (int)imember->conference->canvas_count - 1) { - y = 0; - } else { - y++; - } - - if (imember->conference->canvases[y]->video_count < imember->conference->canvases[y]->total_layers) { - imember->canvas_id = y; - break; - } + if (imember->canvas_id == (int)imember->conference->canvas_count - 1) { + imember->canvas_id = 0; + } else { + imember->canvas_id++; } imember->layer_timeout = DEFAULT_LAYER_TIMEOUT;