提交 e6dd2887 authored 作者: Mike Jerris's avatar Mike Jerris 提交者: Andrey Volk

FS-11511: [mod_conference] allow conference vid-banner command to be run when…

FS-11511: [mod_conference] allow conference vid-banner command to be run when you don't have video actively on the screen
上级 554519f0
......@@ -2596,36 +2596,26 @@ switch_status_t conference_api_sub_vid_banner(conference_member_t *member, switc
mcu_layer_t *layer = NULL;
char *text = (char *) data;
if (member == NULL)
if (member == NULL) {
return SWITCH_STATUS_GENERR;
}
switch_url_decode(text);
if (!switch_channel_test_flag(member->channel, CF_VIDEO)) {
stream->write_function(stream, "-ERR Channel %s does not have video capability!\n", switch_channel_get_name(member->channel));
return SWITCH_STATUS_SUCCESS;
}
if (zstr(text)) goto end;
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;
}
member->video_banner_text = switch_core_strdup(member->pool, text);
if (zstr(text)) {
stream->write_function(stream, "-ERR No text supplied\n", switch_channel_get_name(member->channel));
goto end;
}
layer = conference_video_get_layer_locked(member);
member->video_banner_text = switch_core_strdup(member->pool, text);
if (!layer) goto end;
conference_video_layer_set_banner(member, layer, NULL);
stream->write_function(stream, "+OK\n");
end:
stream->write_function(stream, "+OK\n");
conference_video_release_layer(&layer);
return SWITCH_STATUS_SUCCESS;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论