]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7513: add mutex
authorAnthony Minessale <anthm@freeswitch.org>
Fri, 20 Feb 2015 00:10:37 +0000 (18:10 -0600)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:04 +0000 (12:47 -0500)
src/mod/applications/mod_conference/mod_conference.c

index f4179f2615c860569211b8c7843f9d4de15ff83d..4ce8757d9ca235be372339b0ed6f32180452f536 100644 (file)
@@ -1341,6 +1341,7 @@ static void init_canvas_layers(conference_obj_t *conference, video_layout_t *vla
 
        if (!conference->canvas) return;
 
+       switch_mutex_lock(conference->canvas->mutex);   
        conference->canvas->layout_floor_id = -1;
 
        for (i = 0; i < vlayout->layers; i++) {
@@ -1386,6 +1387,8 @@ static void init_canvas_layers(conference_obj_t *conference, video_layout_t *vla
 
        conference->canvas->layers_used = 0;
        conference->canvas->total_layers = vlayout->layers;
+       switch_mutex_unlock(conference->canvas->mutex); 
+
 }
 
 static void init_canvas(conference_obj_t *conference, video_layout_t *vlayout)
@@ -1829,7 +1832,7 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
                }
 
        }
-       
+
        for (i = 0; i < MCU_MAX_LAYERS; i++) {
                layer = &conference->canvas->layers[i];