retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-7760 add clear vs allclear to logo and banner api to clear variable too

This commit is contained in:
Anthony Minessale 2015-07-29 21:31:56 -05:00
parent c6596b1bd0
commit 51b38145e4
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1513,7 +1513,12 @@ switch_status_t conference_api_sub_vid_logo_img(conference_member_t *member, swi
goto end;
}
if (strcasecmp(text, "clear")) {
if (!strcasecmp(text, "allclear")) {
switch_channel_set_variable(member->channel, "video_logo_path", NULL);
member->video_logo = NULL;
} if (!strcasecmp(text, "clear")) {
member->video_logo = NULL;
} else {
member->video_logo = switch_core_strdup(member->pool, text);
}

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

@ -688,7 +688,7 @@ void conference_video_layer_set_logo(conference_member_t *member, mcu_layer_t *l
if (zstr(path) || !strcasecmp(path, "clear")) {
switch_img_free(&layer->banner_img);
layer->banner_patched = 0;
member->video_logo = NULL;
switch_img_fill(layer->canvas->img, layer->x_pos, layer->y_pos, layer->screen_w, layer->screen_h,
&layer->canvas->letterbox_bgcolor);
@ -772,13 +772,17 @@ void conference_video_layer_set_banner(conference_member_t *member, mcu_layer_t
text = switch_channel_get_variable_dup(member->channel, "video_banner_text", SWITCH_FALSE, -1);
}
if (zstr(text) || !strcasecmp(text, "clear")) {
if (zstr(text) || !strcasecmp(text, "clear") || !strcasecmp(text, "allclear")) {
switch_img_free(&layer->banner_img);
layer->banner_patched = 0;
switch_img_fill(layer->canvas->img, layer->x_pos, layer->y_pos, layer->screen_w, layer->screen_h,
&layer->canvas->letterbox_bgcolor);
if (!strcasecmp(text, "allclear")) {
switch_channel_set_variable(member->channel, "video_banner_text", NULL);
}
goto end;
}
@ -1867,7 +1871,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
}
}
}
if (count_changed) {
need_refresh = 1;
need_keyframe = 1;