show last frame as blank

This commit is contained in:
Devaev Maxim 2019-09-20 00:41:41 +03:00
parent aaa60e63a4
commit 3b7a84d0d7
6 changed files with 27 additions and 11 deletions

View File

@ -43,6 +43,7 @@ kvmd:
- "--quality={quality}" - "--quality={quality}"
- "--desired-fps={desired_fps}" - "--desired-fps={desired_fps}"
- "--drop-same-frames=30" - "--drop-same-frames=30"
- "--last-as-blank=0"
- "--unix={unix}" - "--unix={unix}"
- "--unix-rm" - "--unix-rm"
- "--unix-mode=0660" - "--unix-mode=0660"

View File

@ -39,6 +39,7 @@ kvmd:
- "--desired-fps={desired_fps}" - "--desired-fps={desired_fps}"
- "--resolution=720x756" - "--resolution=720x756"
- "--fake-resolution=800x600" - "--fake-resolution=800x600"
- "--last-as-blank=0"
- "--unix={unix}" - "--unix={unix}"
- "--unix-rm" - "--unix-rm"
- "--unix-mode=0660" - "--unix-mode=0660"

View File

@ -45,6 +45,7 @@ kvmd:
- "--quality={quality}" - "--quality={quality}"
- "--desired-fps={desired_fps}" - "--desired-fps={desired_fps}"
- "--drop-same-frames=30" - "--drop-same-frames=30"
- "--last-as-blank=0"
- "--unix={unix}" - "--unix={unix}"
- "--unix-rm" - "--unix-rm"
- "--unix-mode=0660" - "--unix-mode=0660"

View File

@ -44,6 +44,7 @@ kvmd:
- "--desired-fps={desired_fps}" - "--desired-fps={desired_fps}"
- "--resolution=720x576" - "--resolution=720x576"
- "--fake-resolution=800x600" - "--fake-resolution=800x600"
- "--last-as-blank=0"
- "--unix={unix}" - "--unix={unix}"
- "--unix-rm" - "--unix-rm"
- "--unix-mode=0660" - "--unix-mode=0660"

View File

@ -35,6 +35,7 @@ kvmd:
- "--quality={quality}" - "--quality={quality}"
- "--desired-fps={desired_fps}" - "--desired-fps={desired_fps}"
- "--resolution=800x600" - "--resolution=800x600"
- "--last-as-blank=0"
- "--unix={unix}" - "--unix={unix}"
- "--unix-rm" - "--unix-rm"
- "--unix-mode=0666" - "--unix-mode=0666"

View File

@ -101,8 +101,6 @@ export function Streamer() {
} }
if (__ensureStream(state.stream.clients_stat)) { if (__ensureStream(state.stream.clients_stat)) {
$("stream-image").className = "stream-image-active";
$("stream-box").classList.remove("stream-box-inactive");
$("stream-led").className = "led-green"; $("stream-led").className = "led-green";
$("stream-led").title = "Stream is active"; $("stream-led").title = "Stream is active";
wm.switchDisabled($("stream-screenshot-button"), false); wm.switchDisabled($("stream-screenshot-button"), false);
@ -112,11 +110,9 @@ export function Streamer() {
tools.info("Stream: active"); tools.info("Stream: active");
} }
__updateStreamHeader(true); __updateStreamWindow(true, state.source.online);
} else { } else {
$("stream-image").className = "stream-image-inactive";
$("stream-box").classList.add("stream-box-inactive");
$("stream-led").className = "led-gray"; $("stream-led").className = "led-gray";
$("stream-led").title = "Stream inactive"; $("stream-led").title = "Stream inactive";
wm.switchDisabled($("stream-screenshot-button"), true); wm.switchDisabled($("stream-screenshot-button"), true);
@ -125,7 +121,7 @@ export function Streamer() {
wm.switchDisabled($("stream-desired-fps-slider"), true); wm.switchDisabled($("stream-desired-fps-slider"), true);
tools.info("Stream: inactive"); tools.info("Stream: inactive");
__updateStreamHeader(false); __updateStreamWindow(false, false);
} }
}; };
@ -161,14 +157,29 @@ export function Streamer() {
} }
}; };
var __updateStreamHeader = function(online) { var __updateStreamWindow = function(is_active, online) {
if (online) {
$("stream-image").className = "stream-image-active";
$("stream-box").classList.remove("stream-box-inactive");
} else {
$("stream-image").className = "stream-image-inactive";
$("stream-box").classList.add("stream-box-inactive");
}
let el_grab = document.querySelector("#stream-window-header .window-grab"); let el_grab = document.querySelector("#stream-window-header .window-grab");
let el_info = $("stream-info"); let el_info = $("stream-info");
if (online) { if (is_active) {
let fps_suffix = (__client_fps >= 0 ? ` / ${__client_fps} fps` : ""); let title = "Stream – ";
el_grab.innerHTML = el_info.innerHTML = `Stream – ${__resolution.width}x${__resolution.height}${fps_suffix}`; if (!online) {
title += "no signal / ";
}
title += `${__resolution.width}x${__resolution.height}`;
if (__client_fps >= 0) {
title += ` / ${__client_fps} fps`;
}
el_grab.innerHTML = el_info.innerHTML = title;
} else { } else {
el_grab.innerHTML = el_info.innerHTML = "Stream – offline"; el_grab.innerHTML = el_info.innerHTML = "Stream – inactive";
} }
}; };