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

FS-11511: [mod_conference] allow conference vid-banner command to be run when you don't have video actively on the screen

This commit is contained in:
Mike Jerris 2018-11-08 16:01:56 +00:00 committed by Andrey Volk
parent 554519f0e4
commit e6dd288762
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2596,36 +2596,26 @@ switch_status_t conference_api_sub_vid_banner(conference_member_t *member, switc
mcu_layer_t *layer = NULL; mcu_layer_t *layer = NULL;
char *text = (char *) data; char *text = (char *) data;
if (member == NULL) if (member == NULL) {
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
}
switch_url_decode(text); switch_url_decode(text);
if (!switch_channel_test_flag(member->channel, CF_VIDEO)) { if (zstr(text)) goto end;
stream->write_function(stream, "-ERR Channel %s does not have video capability!\n", switch_channel_get_name(member->channel));
return SWITCH_STATUS_SUCCESS;
}
layer = conference_video_get_layer_locked(member);
if (!layer) {
stream->write_function(stream, "-ERR Channel %s is not in a video layer\n", switch_channel_get_name(member->channel));
goto end;
}
if (zstr(text)) {
stream->write_function(stream, "-ERR No text supplied\n", switch_channel_get_name(member->channel));
goto end;
}
member->video_banner_text = switch_core_strdup(member->pool, text); member->video_banner_text = switch_core_strdup(member->pool, text);
layer = conference_video_get_layer_locked(member);
if (!layer) goto end;
conference_video_layer_set_banner(member, layer, NULL); conference_video_layer_set_banner(member, layer, NULL);
stream->write_function(stream, "+OK\n");
end: end:
stream->write_function(stream, "+OK\n");
conference_video_release_layer(&layer); conference_video_release_layer(&layer);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;