提交 97c81a82 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-7513 FS-7509: add control for png and fix bug with null args

上级 334706eb
This diff was suppressed by a .gitattributes entry.
......@@ -619,10 +619,16 @@ function pop(id, cname, dft) {
});
}
var devinit = false;
function refresh_devices()
{
$("#usecamera").empty();
$("#usemic").empty();
if (devinit) {
$("#usecamera").empty();
$("#usemic").empty();
}
devinit = true;
$.verto.findDevices(function() {
var x = 0;
......
......@@ -2877,7 +2877,7 @@ static void conference_mod_event_channel_handler(const char *event_channel, cJSO
exec = switch_mprintf("%s %s %d %s", conf_name, action, cid, argv[0]);
} else if (!strcasecmp(action, "play") || !strcasecmp(action, "stop")) {
exec = switch_mprintf("%s %s %s", conf_name, action, argv[0]);
} else if (!strcasecmp(action, "recording") || !strcasecmp(action, "vid-layout")) {
} else if (!strcasecmp(action, "recording") || !strcasecmp(action, "vid-layout") || !strcasecmp(action, "vid-write-png")) {
if (!argv[1]) {
argv[1] = "all";
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论