From 4e4031c0c19088e8f22240454b8150fb10d3685e Mon Sep 17 00:00:00 2001 From: Awawa Date: Sun, 5 Sep 2021 13:08:19 +0200 Subject: [PATCH] v17 beta 2 & auto resume for video grabber --- assets/webconfig/i18n/cs.json | 6 ++- assets/webconfig/i18n/de.json | 6 ++- assets/webconfig/i18n/en.json | 6 ++- assets/webconfig/i18n/es.json | 6 ++- assets/webconfig/i18n/fr.json | 6 ++- assets/webconfig/i18n/it.json | 6 ++- assets/webconfig/i18n/nl.json | 6 ++- assets/webconfig/i18n/pl.json | 6 ++- assets/webconfig/i18n/ro.json | 6 ++- assets/webconfig/i18n/ru.json | 6 ++- assets/webconfig/i18n/sv.json | 6 ++- assets/webconfig/i18n/tr.json | 6 ++- assets/webconfig/i18n/vi.json | 6 ++- assets/webconfig/i18n/zh-CN.json | 6 ++- include/hyperhdrbase/DetectionAutomatic.h | 2 + include/hyperhdrbase/DetectionManual.h | 2 + include/hyperhdrbase/Grabber.h | 4 ++ include/hyperhdrbase/GrabberWrapper.h | 3 ++ include/hyperhdrbase/VideoControl.h | 2 + libsrc/hyperhdrbase/DetectionAutomatic.cpp | 5 +++ libsrc/hyperhdrbase/DetectionManual.cpp | 5 +++ libsrc/hyperhdrbase/Grabber.cpp | 31 ++++++++++++++ libsrc/hyperhdrbase/GrabberWrapper.cpp | 14 +++++++ libsrc/hyperhdrbase/VideoControl.cpp | 14 +++++++ .../schema/schema-videoGrabber.json | 41 +++++++++++-------- version | 2 +- 26 files changed, 164 insertions(+), 45 deletions(-) diff --git a/assets/webconfig/i18n/cs.json b/assets/webconfig/i18n/cs.json index 38621e467..6032ddb5d 100644 --- a/assets/webconfig/i18n/cs.json +++ b/assets/webconfig/i18n/cs.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "Snímek obrazovky", "edt_conf_enum_linear_alternative": "Alternativní lineární (rychlejší)", "edt_conf_smooth_antiFlickeringTimeout_title": "Časový limit proti blikání", - "edt_conf_smooth_antiFlickeringTimeout_expl": "Povolit změnu barvy LED diody RGB po vlastním čase v milisekundách, i když je krok pod minimem (0 = deaktivováno, jinak je navrhovaná hodnota alespoň 3000, což dává 3 sekundy)", + "edt_conf_smooth_antiFlickeringTimeout_expl": "Povolit změnu barvy LED diody RGB po vlastním čase v milisekundách, i když je krok pod minimem (0 = deaktivováno, jinak je navrhovaná hodnota alespoň 500, což dává 0.5 sekundy)", "dashboard_current_video_device": "Video zařízení", "dashboard_current_video_mode": "Režim videa", "general_comp_HDR": "HDR (globální)", @@ -1125,5 +1125,7 @@ "json_api_clear_expl": "Jasná priorita z efektů a přednastavených barev.", "json_api_hdr": "Režim HDR", "json_api_hdr_expl": "Zapnutí/vypnutí mapování tónu HDR pro USB grabber. „Border mode“ funguje pouze pro stream MJPEG.", - "json_api_components_expl_multi": "S jediným odkazem můžete spustit více příkazů. Maximální délka je 2048 znaků. Všechny budou spuštěny, ale obdržíte pouze jednu odpověď (podívejte se do protokolů pro veškerý výstup). Jednoduše vložte obsah odkazů požadavek do formátu (první poznámka „?“ A další znaky „&“):
http: // IP: PORT/json-rpc? request = request1 & request = request2 & request = request3 ... " + "json_api_components_expl_multi": "S jediným odkazem můžete spustit více příkazů. Maximální délka je 2048 znaků. Všechny budou spuštěny, ale obdržíte pouze jednu odpověď (podívejte se do protokolů pro veškerý výstup). Jednoduše vložte obsah odkazů požadavek do formátu (první poznámka „?“ A další znaky „&“):
http: // IP: PORT/json-rpc? request = request1 & request = request2 & request = request3 ... ", + "edt_conf_stream_autoResume_title": "Automatické obnovení", + "edt_conf_stream_autoResume_expl": "Pokud se stream videa zastaví, zkuste restartovat nahrávání videa. Používejte opatrně, protože není řešením problémů s hardwarem grabberu." } diff --git a/assets/webconfig/i18n/de.json b/assets/webconfig/i18n/de.json index 9fdb7f3e3..ef78fe2dc 100644 --- a/assets/webconfig/i18n/de.json +++ b/assets/webconfig/i18n/de.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "Bildschirmfoto", "edt_conf_enum_linear_alternative": "Alternativ linear (schneller)", "edt_conf_smooth_antiFlickeringTimeout_title": "Anti-Flimmer-Timeout", - "edt_conf_smooth_antiFlickeringTimeout_expl": "Erlauben Sie, eine RGB-LED-Farbe nach einer benutzerdefinierten Zeit in Millisekunden zu ändern, auch wenn der Schritt unter dem Minimum liegt (0 = deaktiviert, andernfalls beträgt der vorgeschlagene Wert mindestens 3000, was 3 Sekunden ergibt)", + "edt_conf_smooth_antiFlickeringTimeout_expl": "Erlauben Sie, eine RGB-LED-Farbe nach einer benutzerdefinierten Zeit in Millisekunden zu ändern, auch wenn der Schritt unter dem Minimum liegt (0 = deaktiviert, andernfalls beträgt der vorgeschlagene Wert mindestens 500, was 0.5 Sekunden ergibt)", "dashboard_current_video_device": "Videogerät", "dashboard_current_video_mode": "Video Modus", "general_comp_HDR": "HDR (global)", @@ -1125,5 +1125,7 @@ "json_api_clear_expl": "Klare Priorität von Effekten und voreingestellten Farben.", "json_api_hdr": "HDR-Modus", "json_api_hdr_expl": "Schalten Sie das HDR-Tone-Mapping für den USB-Grabber ein/aus. Der 'Grenzmodus' funktioniert nur für MJPEG-Streams.", - "json_api_components_expl_multi": "Sie können mehrere Befehle mit nur einem Link ausführen. Die maximale Länge beträgt 2048 Zeichen. Sie werden alle ausgeführt, aber Sie erhalten nur eine Antwort (überprüfen Sie die Protokolle für alle Ausgaben). Geben Sie einfach den Inhalt der Anfrage Ihres Links in das folgende Format ein (beachten Sie das erste '?'-Zeichen und das nächste '&'-Zeichen):
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3..." + "json_api_components_expl_multi": "Sie können mehrere Befehle mit nur einem Link ausführen. Die maximale Länge beträgt 2048 Zeichen. Sie werden alle ausgeführt, aber Sie erhalten nur eine Antwort (überprüfen Sie die Protokolle für alle Ausgaben). Geben Sie einfach den Inhalt der Anfrage Ihres Links in das folgende Format ein (beachten Sie das erste '?'-Zeichen und das nächste '&'-Zeichen):
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3...", + "edt_conf_stream_autoResume_title": "Automatisch fortsetzen", + "edt_conf_stream_autoResume_expl": "Versuchen Sie, die Videoaufnahme neu zu starten, wenn der Videostream stoppt. Seien Sie vorsichtig, da dies kein Heilmittel für Hardwareprobleme des Grabbers ist." } diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json index 26c0c842e..f37c30f0a 100644 --- a/assets/webconfig/i18n/en.json +++ b/assets/webconfig/i18n/en.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "Screenshot", "edt_conf_enum_linear_alternative": "Alternative linear (faster)", "edt_conf_smooth_antiFlickeringTimeout_title" : "Anti-flickering timeout", - "edt_conf_smooth_antiFlickeringTimeout_expl" : "Allow to change a RGB led color, after custom time in miliseconds, even if the step is below minimum (0 = disabled, otherwise proposed value is at least 3000 which gives 3 seconds)", + "edt_conf_smooth_antiFlickeringTimeout_expl" : "Allow to change a RGB led color, after custom time in miliseconds, even if the step is below minimum (0 = disabled, otherwise proposed value is at least 500 which gives 0.5 seconds)", "dashboard_current_video_device" : "Video device", "dashboard_current_video_mode" : "Video mode", "general_comp_HDR" : "HDR (global)", @@ -1125,5 +1125,7 @@ "json_api_clear_expl" : "Clear priority from effects and preset colors.", "json_api_hdr" : "HDR mode", "json_api_hdr_expl" : "Turn on/off HDR tone mapping for USB grabber. 'Border mode' works only for MJPEG stream.", - "json_api_components_expl_multi":"You can run multiple commands with just one link. Maximum lenght is 2048 chars. They all will be executed but you will receive only one response (check out logs for all the output). Just put your links' request content into the format (note first '?' char and next '&' chars):
http://IP:PORT/json-rpc?request=request1&request=request2&request=request3..." + "json_api_components_expl_multi":"You can run multiple commands with just one link. Maximum lenght is 2048 chars. They all will be executed but you will receive only one response (check out logs for all the output). Just put your links' request content into the format (note first '?' char and next '&' chars):
http://IP:PORT/json-rpc?request=request1&request=request2&request=request3...", + "edt_conf_stream_autoResume_title" : "Auto resume", + "edt_conf_stream_autoResume_expl" : "Try restarting video capture if the video stream stops. Use with caution as it is not a cure for hardware problems of the grabber." } diff --git a/assets/webconfig/i18n/es.json b/assets/webconfig/i18n/es.json index c6c3f7781..8df31169a 100644 --- a/assets/webconfig/i18n/es.json +++ b/assets/webconfig/i18n/es.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "Captura de pantalla", "edt_conf_enum_linear_alternative": "Lineal alternativo (más rápido)", "edt_conf_smooth_antiFlickeringTimeout_title": "Tiempo de espera anti-parpadeo", - "edt_conf_smooth_antiFlickeringTimeout_expl": "Permitir cambiar un color de led RGB, después del tiempo personalizado en milisegundos, incluso si el paso está por debajo del mínimo (0 = deshabilitado, de lo contrario el valor propuesto es al menos 3000 lo que da 3 segundos)", + "edt_conf_smooth_antiFlickeringTimeout_expl": "Permitir cambiar un color de led RGB, después del tiempo personalizado en milisegundos, incluso si el paso está por debajo del mínimo (0 = deshabilitado, de lo contrario el valor propuesto es al menos 500 lo que da 0.5 segundos)", "dashboard_current_video_device": "Dispositivo de video", "dashboard_current_video_mode": "Modo de vídeo", "general_comp_HDR": "HDR (global)", @@ -1125,5 +1125,7 @@ "json_api_clear_expl": "Prioridad clara de efectos y colores preestablecidos.", "json_api_hdr": "Modo HDR", "json_api_hdr_expl": "Activa / desactiva el mapeo de tonos HDR para capturador USB. El 'modo de borde' funciona solo para la transmisión MJPEG.", - "json_api_components_expl_multi": "Puede ejecutar varios comandos con un solo enlace. La longitud máxima es de 2048 caracteres. Todos se ejecutarán, pero solo recibirá una respuesta (consulte los registros para ver todos los resultados). Simplemente coloque el contenido de su enlace ' request en el formato (observe primero el carácter'? 'Y el siguiente carácter' & '):
http: // IP: PORT / json-rpc? request = request1 & request = request2 & request = request3 ... " + "json_api_components_expl_multi": "Puede ejecutar varios comandos con un solo enlace. La longitud máxima es de 2048 caracteres. Todos se ejecutarán, pero solo recibirá una respuesta (consulte los registros para ver todos los resultados). Simplemente coloque el contenido de su enlace ' request en el formato (observe primero el carácter'? 'Y el siguiente carácter' & '):
http: // IP: PORT / json-rpc? request = request1 & request = request2 & request = request3 ... ", + "edt_conf_stream_autoResume_title": "Reanudación automática", + "edt_conf_stream_autoResume_expl": "Intente reiniciar la captura de video si la transmisión de video se detiene. Úselo con precaución, ya que no es una cura para los problemas de hardware del grabador." } diff --git a/assets/webconfig/i18n/fr.json b/assets/webconfig/i18n/fr.json index 6aecf527a..8b1073d5b 100644 --- a/assets/webconfig/i18n/fr.json +++ b/assets/webconfig/i18n/fr.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "Capture d'écran", "edt_conf_enum_linear_alternative": "Linéaire alternatif (plus rapide)", "edt_conf_smooth_antiFlickeringTimeout_title": "Délai d'attente anti-scintillement", - "edt_conf_smooth_antiFlickeringTimeout_expl": "Permet de changer une couleur de led RVB, après un temps personnalisé en millisecondes, même si le pas est en dessous du minimum (0 = désactivé, sinon la valeur proposée est d'au moins 3000 ce qui donne 3 secondes)", + "edt_conf_smooth_antiFlickeringTimeout_expl": "Permet de changer une couleur de led RVB, après un temps personnalisé en millisecondes, même si le pas est en dessous du minimum (0 = désactivé, sinon la valeur proposée est d'au moins 500 ce qui donne 0.5 secondes)", "dashboard_current_video_device": "Appareil vidéo", "dashboard_current_video_mode": "Mode vidéo", "general_comp_HDR": "HDR (mondial)", @@ -1125,5 +1125,7 @@ "json_api_clear_expl": "Effacer la priorité des effets et des couleurs prédéfinies.", "json_api_hdr": "Mode HDR", "json_api_hdr_expl": "Activez/désactivez le mappage de tonalité HDR pour la capture USB. Le « mode frontière » ne fonctionne que pour le flux MJPEG.", - "json_api_components_expl_multi": "Vous pouvez exécuter plusieurs commandes avec un seul lien. La longueur maximale est de 2048 caractères. Ils seront tous exécutés mais vous ne recevrez qu'une seule réponse (consultez les journaux pour toutes les sorties). Mettez simplement le contenu de la request de vos liens dans le format (notez le premier caractère '?' et les caractères '&' suivants) :
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3..." + "json_api_components_expl_multi": "Vous pouvez exécuter plusieurs commandes avec un seul lien. La longueur maximale est de 2048 caractères. Ils seront tous exécutés mais vous ne recevrez qu'une seule réponse (consultez les journaux pour toutes les sorties). Mettez simplement le contenu de la request de vos liens dans le format (notez le premier caractère '?' et les caractères '&' suivants) :
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3...", + "edt_conf_stream_autoResume_title": "Reprise automatique", + "edt_conf_stream_autoResume_expl": "Essayez de redémarrer la capture vidéo si le flux vidéo s'arrête. A utiliser avec prudence car ce n'est pas un remède aux problèmes matériels de la pince." } diff --git a/assets/webconfig/i18n/it.json b/assets/webconfig/i18n/it.json index 2c6f0b4df..aa5d9544d 100644 --- a/assets/webconfig/i18n/it.json +++ b/assets/webconfig/i18n/it.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "Immagine dello schermo", "edt_conf_enum_linear_alternative": "Lineare alternativo (più veloce)", "edt_conf_smooth_antiFlickeringTimeout_title": "Timeout anti-sfarfallio", - "edt_conf_smooth_antiFlickeringTimeout_expl": "Consentono di cambiare il colore di un led RGB, dopo un tempo personalizzato in millisecondi, anche se il passo è inferiore al minimo (0 = disabilitato, altrimenti il valore proposto è almeno 3000 che dà 3 secondi)", + "edt_conf_smooth_antiFlickeringTimeout_expl": "Consentono di cambiare il colore di un led RGB, dopo un tempo personalizzato in millisecondi, anche se il passo è inferiore al minimo (0 = disabilitato, altrimenti il valore proposto è almeno 500 che dà 0.5 secondi)", "dashboard_current_video_device": "Dispositivo video", "dashboard_current_video_mode": "Modalità video", "general_comp_HDR": "HDR (globale)", @@ -1125,5 +1125,7 @@ "json_api_clear_expl": "Cancella priorità dagli effetti e dai colori preimpostati.", "json_api_hdr": "Modalità HDR", "json_api_hdr_expl": "Attiva/disattiva la mappatura dei toni HDR per USB grabber. La 'Modalità bordo' funziona solo per il flusso MJPEG.", - "json_api_components_expl_multi": "Puoi eseguire più comandi con un solo collegamento. La lunghezza massima è di 2048 caratteri. Verranno eseguiti tutti ma riceverai una sola risposta (controlla i log per tutto l'output). Inserisci semplicemente il contenuto della richiesta dei tuoi link nel formato (nota il primo carattere '?' e il successivo carattere '&'):
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3..." + "json_api_components_expl_multi": "Puoi eseguire più comandi con un solo collegamento. La lunghezza massima è di 2048 caratteri. Verranno eseguiti tutti ma riceverai una sola risposta (controlla i log per tutto l'output). Inserisci semplicemente il contenuto della richiesta dei tuoi link nel formato (nota il primo carattere '?' e il successivo carattere '&'):
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3...", + "edt_conf_stream_autoResume_title": "Ripristino automatico", + "edt_conf_stream_autoResume_expl": "Prova a riavviare l'acquisizione video se il flusso video si interrompe. Usare con cautela in quanto non è una cura per i problemi hardware del grabber." } diff --git a/assets/webconfig/i18n/nl.json b/assets/webconfig/i18n/nl.json index 9be7054f6..ec0b2561e 100644 --- a/assets/webconfig/i18n/nl.json +++ b/assets/webconfig/i18n/nl.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "Schermafbeelding", "edt_conf_enum_linear_alternative": "Alternatief lineair (sneller)", "edt_conf_smooth_antiFlickeringTimeout_title": "Anti-flikkering time-out", - "edt_conf_smooth_antiFlickeringTimeout_expl": "Sta toe om een RGB led-kleur te veranderen, na aangepaste tijd in milliseconden, zelfs als de stap onder het minimum is (0 = uitgeschakeld, anders is de voorgestelde waarde minstens 3000 wat 3 seconden geeft)", + "edt_conf_smooth_antiFlickeringTimeout_expl": "Sta toe om een RGB led-kleur te veranderen, na aangepaste tijd in milliseconden, zelfs als de stap onder het minimum is (0 = uitgeschakeld, anders is de voorgestelde waarde minstens 500 wat 0.5 seconden geeft)", "dashboard_current_video_device": "Videoapparaat", "dashboard_current_video_mode": "Videomodus", "general_comp_HDR": "HDR (wereldwijd)", @@ -1125,5 +1125,7 @@ "json_api_clear_expl": "Duidelijke prioriteit van effecten en vooraf ingestelde kleuren.", "json_api_hdr": "HDR-modus", "json_api_hdr_expl": "Schakel HDR-toontoewijzing voor USB-grabber in/uit. 'Border-modus' werkt alleen voor MJPEG-stream.", - "json_api_components_expl_multi": "U kunt meerdere opdrachten uitvoeren met slechts één link. Maximale lengte is 2048 tekens. Ze worden allemaal uitgevoerd, maar u ontvangt slechts één reactie (bekijk de logs voor alle uitvoer). Plaats de verzoek-inhoud van uw links in het formaat (let op eerste '?'-teken en volgende '&'-tekens):
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3..." + "json_api_components_expl_multi": "U kunt meerdere opdrachten uitvoeren met slechts één link. Maximale lengte is 2048 tekens. Ze worden allemaal uitgevoerd, maar u ontvangt slechts één reactie (bekijk de logs voor alle uitvoer). Plaats de verzoek-inhoud van uw links in het formaat (let op eerste '?'-teken en volgende '&'-tekens):
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3...", + "edt_conf_stream_autoResume_title": "Automatisch hervatten", + "edt_conf_stream_autoResume_expl": "Probeer de video-opname opnieuw te starten als de videostream stopt. Wees voorzichtig, want het is geen remedie voor hardwareproblemen van de grabber." } diff --git a/assets/webconfig/i18n/pl.json b/assets/webconfig/i18n/pl.json index 6edc1466b..6c6516d33 100644 --- a/assets/webconfig/i18n/pl.json +++ b/assets/webconfig/i18n/pl.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "Zrzut ekranu", "edt_conf_enum_linear_alternative": "Alternatywny liniowy (szybszy)", "edt_conf_smooth_antiFlickeringTimeout_title": "Limit czasu zapobiegający migotaniu", - "edt_conf_smooth_antiFlickeringTimeout_expl": "Pozwala zmienić kolor diody RGB po niestandardowym czasie w milisekundach, nawet jeśli krok jest poniżej minimum (0 = wyłączone, w przeciwnym razie proponowana wartość to co najmniej 3000, co daje 3 sekundy)", + "edt_conf_smooth_antiFlickeringTimeout_expl": "Pozwala zmienić kolor diody RGB po niestandardowym czasie w milisekundach, nawet jeśli krok jest poniżej minimum (0 = wyłączone, w przeciwnym razie proponowana wartość to co najmniej 500, co daje 0.5 sekundy)", "dashboard_current_video_device": "Urządzenie wideo", "dashboard_current_video_mode": "Tryb wideo", "general_comp_HDR": "HDR (globalny)", @@ -1125,5 +1125,7 @@ "json_api_clear_expl": "Wyczyść priorytet efektów i wstępnie ustawionych kolorów.", "json_api_hdr": "Tryb HDR", "json_api_hdr_expl": "Włącz/wyłącz mapowanie tonów HDR dla grabbera USB. „Tryb graniczny” działa tylko dla strumienia MJPEG.", - "json_api_components_expl_multi": "Możesz uruchomić wiele poleceń za pomocą jednego łącza. Maksymalna długość to 2048 znaków. Wszystkie zostaną wykonane, ale otrzymasz tylko jedną odpowiedź (sprawdź logi dla wszystkich danych wyjściowych). Po prostu umieść zawartość żądanie linków w formacie (zanotuj najpierw znak '?', a następnie znak '&'):
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3..." + "json_api_components_expl_multi": "Możesz uruchomić wiele poleceń za pomocą jednego łącza. Maksymalna długość to 2048 znaków. Wszystkie zostaną wykonane, ale otrzymasz tylko jedną odpowiedź (sprawdź logi dla wszystkich danych wyjściowych). Po prostu umieść zawartość żądanie linków w formacie (zanotuj najpierw znak '?', a następnie znak '&'):
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3...", + "edt_conf_stream_autoResume_title": "Automatyczne wznawianie", + "edt_conf_stream_autoResume_expl": "Spróbuj ponownie uruchomić przechwytywanie wideo, jeśli strumień wideo zostanie zatrzymany. Używaj ostrożnie, ponieważ nie jest to lekarstwo na problemy sprzętowe grabbera." } diff --git a/assets/webconfig/i18n/ro.json b/assets/webconfig/i18n/ro.json index f5af6f990..182669fd9 100644 --- a/assets/webconfig/i18n/ro.json +++ b/assets/webconfig/i18n/ro.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "Captură de ecran", "edt_conf_enum_linear_alternative": "Alternativ liniar (mai rapid)", "edt_conf_smooth_antiFlickeringTimeout_title": "Timp de expirare anti-pâlpâire", - "edt_conf_smooth_antiFlickeringTimeout_expl": "Permiteți schimbarea culorii ledului RGB, după timpul personalizat în milisecunde, chiar dacă pasul este sub minim (0 = dezactivat, altfel valoarea propusă este de cel puțin 3000, ceea ce dă 3 secunde)", + "edt_conf_smooth_antiFlickeringTimeout_expl": "Permiteți schimbarea culorii ledului RGB, după timpul personalizat în milisecunde, chiar dacă pasul este sub minim (0 = dezactivat, altfel valoarea propusă este de cel puțin 500, ceea ce dă 0.5 secunde)", "dashboard_current_video_device": "Dispozitiv video", "dashboard_current_video_mode": "Mod video", "general_comp_HDR": "HDR (global)", @@ -1125,5 +1125,7 @@ "json_api_clear_expl": "Ștergeți prioritatea de la efecte și culori prestabilite.", "json_api_hdr": "Mod HDR", "json_api_hdr_expl": "Activați / dezactivați maparea tonurilor HDR pentru dispozitivul de captare USB. „Modul de frontieră” funcționează numai pentru fluxul MJPEG.", - "json_api_components_expl_multi": "Puteți rula mai multe comenzi cu un singur link. Lungimea maximă este de 2048 de caractere. Toate vor fi executate, dar veți primi un singur răspuns (verificați jurnalele pentru toate ieșirile). Pur și simplu puneți conținutul „ request al link-urilor în format (notați mai întâi„? ”Char și următoarele„ & ”chars):
http: // IP: PORT / json-rpc? request = request1 & request = request2 & request = request3 ... " + "json_api_components_expl_multi": "Puteți rula mai multe comenzi cu un singur link. Lungimea maximă este de 2048 de caractere. Toate vor fi executate, dar veți primi un singur răspuns (verificați jurnalele pentru toate ieșirile). Pur și simplu puneți conținutul „ request al link-urilor în format (notați mai întâi„? ”Char și următoarele„ & ”chars):
http: // IP: PORT / json-rpc? request = request1 & request = request2 & request = request3 ... ", + "edt_conf_stream_autoResume_title": "Reluare automată", + "edt_conf_stream_autoResume_expl": "Încercați să reporniți captura video dacă fluxul video se oprește. Utilizați cu precauție, deoarece nu este un remediu pentru problemele hardware ale dispozitivului de prindere." } diff --git a/assets/webconfig/i18n/ru.json b/assets/webconfig/i18n/ru.json index 8b0ecbe84..99328d862 100644 --- a/assets/webconfig/i18n/ru.json +++ b/assets/webconfig/i18n/ru.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "Скриншот", "edt_conf_enum_linear_alternative": "Альтернативный линейный (быстрее)", "edt_conf_smooth_antiFlickeringTimeout_title": "Таймаут анти-мерцания", - "edt_conf_smooth_antiFlickeringTimeout_expl": "Разрешить изменять цвет светодиода RGB по истечении заданного времени в миллисекундах, даже если шаг ниже минимального (0 = отключено, в противном случае предлагаемое значение составляет не менее 3000, что дает 3 секунды)", + "edt_conf_smooth_antiFlickeringTimeout_expl": "Разрешить изменять цвет светодиода RGB по истечении заданного времени в миллисекундах, даже если шаг ниже минимального (0 = отключено, в противном случае предлагаемое значение составляет не менее 500, что дает 0.5 секунды)", "dashboard_current_video_device": "Видео устройство", "dashboard_current_video_mode": "Видео режим", "general_comp_HDR": "HDR (глобальный)", @@ -1125,5 +1125,7 @@ "json_api_clear_expl": "Очистите приоритет от эффектов и предустановленных цветов.", "json_api_hdr": "Режим HDR", "json_api_hdr_expl": "Включение / выключение тонального отображения HDR для USB-граббера. «Пограничный режим» работает только для потока MJPEG.", - "json_api_components_expl_multi": "Вы можете запускать несколько команд с помощью одной ссылки. Максимальная длина - 2048 символов. Все они будут выполнены, но вы получите только один ответ (просмотрите журналы для всего вывода). Просто поместите содержимое request ваших ссылок в формат (обратите внимание на первый символ '?' И следующие символы '&'):
http: // IP: PORT / json-rpc? запрос = запрос1 & запрос = запрос2 & запрос = запрос3 ... " + "json_api_components_expl_multi": "Вы можете запускать несколько команд с помощью одной ссылки. Максимальная длина - 2048 символов. Все они будут выполнены, но вы получите только один ответ (просмотрите журналы для всего вывода). Просто поместите содержимое request ваших ссылок в формат (обратите внимание на первый символ '?' И следующие символы '&'):
http: // IP: PORT / json-rpc? запрос = запрос1 & запрос = запрос2 & запрос = запрос3 ... ", + "edt_conf_stream_autoResume_title": "Авто возобновление", + "edt_conf_stream_autoResume_expl": "Попробуйте перезапустить захват видео, если видеопоток остановился. Используйте с осторожностью, так как это не лекарство от аппаратных проблем граббера." } diff --git a/assets/webconfig/i18n/sv.json b/assets/webconfig/i18n/sv.json index 03676d654..b4becaa68 100644 --- a/assets/webconfig/i18n/sv.json +++ b/assets/webconfig/i18n/sv.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "Skärmdump", "edt_conf_enum_linear_alternative": "Alternativ linjär (snabbare)", "edt_conf_smooth_antiFlickeringTimeout_title": "Anti-flimrande timeout", - "edt_conf_smooth_antiFlickeringTimeout_expl": "Tillåt att ändra en RGB -ledfärg efter anpassad tid i milisekunder, även om steget är under minimum (0 = inaktiverat, annars är föreslaget värde minst 3000 vilket ger 3 sekunder)", + "edt_conf_smooth_antiFlickeringTimeout_expl": "Tillåt att ändra en RGB -ledfärg efter anpassad tid i milisekunder, även om steget är under minimum (0 = inaktiverat, annars är föreslaget värde minst 500 vilket ger 0.5 sekunder)", "dashboard_current_video_device": "Videoenhet", "dashboard_current_video_mode": "Video läge", "general_comp_HDR": "HDR (globalt)", @@ -1125,5 +1125,7 @@ "json_api_clear_expl": "Tydlig prioritet från effekter och förinställda färger.", "json_api_hdr": "HDR -läge", "json_api_hdr_expl": "Slå på/av HDR -tonmappning för USB -gripare. \"Gränsläge\" fungerar endast för MJPEG -ström.", - "json_api_components_expl_multi": "Du kan köra flera kommandon med bara en länk. Maxlängd är 2048 tecken. Alla kommer att köras men du får bara ett svar (kolla in loggar för all utmatning). Lägg bara in dina länks begäran innehåll i formatet (notera först '?' Char och nästa '&' tecken):
http: // IP: PORT/json-rpc? request = request1 & request = request2 & request = request3 ... " + "json_api_components_expl_multi": "Du kan köra flera kommandon med bara en länk. Maxlängd är 2048 tecken. Alla kommer att köras men du får bara ett svar (kolla in loggar för all utmatning). Lägg bara in dina länks begäran innehåll i formatet (notera först '?' Char och nästa '&' tecken):
http: // IP: PORT/json-rpc? request = request1 & request = request2 & request = request3 ... ", + "edt_conf_stream_autoResume_title": "Återuppta automatiskt", + "edt_conf_stream_autoResume_expl": "Prova att starta om videoinspelningen om videoströmmen stannar. Använd med försiktighet eftersom det inte är ett botemedel mot maskinvaruproblem hos griparen." } diff --git a/assets/webconfig/i18n/tr.json b/assets/webconfig/i18n/tr.json index 3bcbaf424..662a8d05e 100644 --- a/assets/webconfig/i18n/tr.json +++ b/assets/webconfig/i18n/tr.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "Ekran görüntüsü", "edt_conf_enum_linear_alternative": "Alternatif doğrusal (daha hızlı)", "edt_conf_smooth_antiFlickeringTimeout_title": "Titreşimsiz zaman aşımı", - "edt_conf_smooth_antiFlickeringTimeout_expl": "Adım minimumun altında olsa bile (0 = devre dışı, aksi takdirde önerilen değer en az 3000'dir ve bu 3 saniye verir) özel süreden sonra RGB led rengini değiştirmeye izin ver", + "edt_conf_smooth_antiFlickeringTimeout_expl": "Adım minimumun altında olsa bile (0 = devre dışı, aksi takdirde önerilen değer en az 500'dir ve bu 0.5 saniye verir) özel süreden sonra RGB led rengini değiştirmeye izin ver", "dashboard_current_video_device": "video cihazı", "dashboard_current_video_mode": "Video modu", "general_comp_HDR": "HDR (küresel)", @@ -1125,5 +1125,7 @@ "json_api_clear_expl": "Efektlerden ve önceden ayarlanmış renklerden önceliği temizleyin.", "json_api_hdr": "HDR modu", "json_api_hdr_expl": "USB yakalayıcı için HDR ton eşlemesini açın/kapatın. 'Sınır modu' yalnızca MJPEG akışı için çalışır.", - "json_api_components_expl_multi": "Tek bir bağlantı ile birden çok komut çalıştırabilirsiniz. Maksimum uzunluk 2048 karakterdir. Hepsi yürütülecek, ancak yalnızca bir yanıt alacaksınız (tüm çıktılar için günlükleri kontrol edin). Bağlantılarınızın 'request içeriğini şu biçime yerleştirin (önce '?' karakterini ve sonraki '&' karakterlerini not edin):
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3..." + "json_api_components_expl_multi": "Tek bir bağlantı ile birden çok komut çalıştırabilirsiniz. Maksimum uzunluk 2048 karakterdir. Hepsi yürütülecek, ancak yalnızca bir yanıt alacaksınız (tüm çıktılar için günlükleri kontrol edin). Bağlantılarınızın 'request içeriğini şu biçime yerleştirin (önce '?' karakterini ve sonraki '&' karakterlerini not edin):
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3...", + "edt_conf_stream_autoResume_title": "Otomatik özgeçmiş", + "edt_conf_stream_autoResume_expl": "Video akışı durursa video yakalamayı yeniden başlatmayı deneyin. Kavrayıcının donanım sorunlarına çare olmadığı için dikkatli kullanın." } diff --git a/assets/webconfig/i18n/vi.json b/assets/webconfig/i18n/vi.json index 6be8b58ca..cdb2c044e 100644 --- a/assets/webconfig/i18n/vi.json +++ b/assets/webconfig/i18n/vi.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "Ảnh chụp màn hình", "edt_conf_enum_linear_alternative": "Tuyến tính thay thế (nhanh hơn)", "edt_conf_smooth_antiFlickeringTimeout_title": "Thời gian chờ chống nhấp nháy", - "edt_conf_smooth_antiFlickeringTimeout_expl": "Cho phép thay đổi màu đèn LED RGB, sau thời gian tùy chỉnh tính bằng mili giây, ngay cả khi bước dưới mức tối thiểu (0 = bị vô hiệu hóa, nếu không giá trị được đề xuất ít nhất là 3000 cho 3 giây)", + "edt_conf_smooth_antiFlickeringTimeout_expl": "Cho phép thay đổi màu đèn LED RGB, sau thời gian tùy chỉnh tính bằng mili giây, ngay cả khi bước dưới mức tối thiểu (0 = bị vô hiệu hóa, nếu không giá trị được đề xuất ít nhất là 500 cho 0.5 giây)", "dashboard_current_video_device": "Thiết bị video", "dashboard_current_video_mode": "Chế độ quay", "general_comp_HDR": "HDR (toàn cầu)", @@ -1125,5 +1125,7 @@ "json_api_clear_expl": "Ưu tiên rõ ràng khỏi các hiệu ứng và màu đặt trước.", "json_api_hdr": "Chế độ HDR", "json_api_hdr_expl": "Bật / tắt ánh xạ giai điệu HDR cho bộ lấy USB. 'Chế độ viền' chỉ hoạt động cho luồng MJPEG.", - "json_api_components_expl_multi": "Bạn có thể chạy nhiều lệnh chỉ với một liên kết. Chiều dài tối đa là 2048 ký tự. Tất cả chúng sẽ được thực thi nhưng bạn sẽ chỉ nhận được một phản hồi (kiểm tra nhật ký cho tất cả đầu ra). Chỉ cần đặt nội dung ' request liên kết của bạn vào định dạng (lưu ý đầu tiên là ký tự'? 'Char và các ký tự' & 'tiếp theo):
http: // IP: PORT / json-rpc? request = request1 & request = request2 & request = request3 ... " + "json_api_components_expl_multi": "Bạn có thể chạy nhiều lệnh chỉ với một liên kết. Chiều dài tối đa là 2048 ký tự. Tất cả chúng sẽ được thực thi nhưng bạn sẽ chỉ nhận được một phản hồi (kiểm tra nhật ký cho tất cả đầu ra). Chỉ cần đặt nội dung ' request liên kết của bạn vào định dạng (lưu ý đầu tiên là ký tự'? 'Char và các ký tự' & 'tiếp theo):
http: // IP: PORT / json-rpc? request = request1 & request = request2 & request = request3 ... ", + "edt_conf_stream_autoResume_title": "Tiếp tục tự động", + "edt_conf_stream_autoResume_expl": "Thử khởi động lại quay video nếu luồng video dừng. Sử dụng một cách thận trọng vì nó không phải là cách chữa trị các vấn đề phần cứng của grabber." } diff --git a/assets/webconfig/i18n/zh-CN.json b/assets/webconfig/i18n/zh-CN.json index a87b2800a..e6829d517 100644 --- a/assets/webconfig/i18n/zh-CN.json +++ b/assets/webconfig/i18n/zh-CN.json @@ -1002,7 +1002,7 @@ "main_ledsim_btn_screenshot": "截屏", "edt_conf_enum_linear_alternative": "替代线性（更快）", "edt_conf_smooth_antiFlickeringTimeout_title": "防闪烁超时", - "edt_conf_smooth_antiFlickeringTimeout_expl": "允许在自定义时间（以毫秒为单位）之后更改 RGB LED 颜色，即使步长低于最小值（0 = 禁用，否则建议值至少为 3000，即提供 3 秒）", + "edt_conf_smooth_antiFlickeringTimeout_expl": "允许在自定义时间（以毫秒为单位）之后更改 RGB LED 颜色，即使步长低于最小值（0 = 禁用，否则建议值至少为 500，即提供 0.5 秒）", "dashboard_current_video_device": "视频设备", "dashboard_current_video_mode": "视频模式", "general_comp_HDR": "HDR（全球）", @@ -1125,5 +1125,7 @@ "json_api_clear_expl": "清除效果和预设颜色的优先级。", "json_api_hdr": "HDR模式", "json_api_hdr_expl": "打开/关闭 USB 采集卡的 HDR 色调映射。 “边框模式”仅适用于 MJPEG 流。", - "json_api_components_expl_multi": "您只需一个链接即可运行多个命令。最大长度为 2048 个字符。它们都将被执行，但您只会收到一个响应（查看所有输出的日志）。只需将您的链接的 request 内容放入格式中（注意首先是“?”字符，然后是“&”字符）：
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3..." + "json_api_components_expl_multi": "您只需一个链接即可运行多个命令。最大长度为 2048 个字符。它们都将被执行，但您只会收到一个响应（查看所有输出的日志）。只需将您的链接的 request 内容放入格式中（注意首先是“?”字符，然后是“&”字符）：
http://IP:PORT/json-rpc? request=request1&request=request2&request=request3...", + "edt_conf_stream_autoResume_title": "自动恢复", + "edt_conf_stream_autoResume_expl": "如果视频流停止，请尝试重新启动视频捕获。谨慎使用，因为它不能解决抓取器的硬件问题。" } diff --git a/include/hyperhdrbase/DetectionAutomatic.h b/include/hyperhdrbase/DetectionAutomatic.h index fbc6962fa..b06018769 100644 --- a/include/hyperhdrbase/DetectionAutomatic.h +++ b/include/hyperhdrbase/DetectionAutomatic.h @@ -20,6 +20,8 @@ class DetectionAutomatic: public QObject public: DetectionAutomatic(); + bool getDetectionAutoSignal(); + struct calibrationPoint { bool init; diff --git a/include/hyperhdrbase/DetectionManual.h b/include/hyperhdrbase/DetectionManual.h index 548d0c09b..5b101d8c5 100644 --- a/include/hyperhdrbase/DetectionManual.h +++ b/include/hyperhdrbase/DetectionManual.h @@ -18,6 +18,8 @@ class DetectionManual public: DetectionManual(); + bool getDetectionManualSignal(); + bool checkSignalDetectionManual(Image& image); void setSignalThreshold(double redSignalThreshold, double greenSignalThreshold, double blueSignalThreshold, int noSignalCounterThreshold); diff --git a/include/hyperhdrbase/Grabber.h b/include/hyperhdrbase/Grabber.h index 6ef78a3ba..e014e17b6 100644 --- a/include/hyperhdrbase/Grabber.h +++ b/include/hyperhdrbase/Grabber.h @@ -14,6 +14,7 @@ #include #include +#include #if defined(_WIN32) || defined(WIN32) @@ -142,6 +143,8 @@ public slots: virtual void newWorkerFrameError(unsigned int workerIndex, QString error, quint64 sourceCount) = 0; + void revive(); + signals: void newFrame(const Image& image); @@ -231,6 +234,7 @@ public slots: bool _signalDetectionEnabled; bool _signalAutoDetectionEnabled; + QSemaphore _synchro; }; bool sortDevicePropertiesItem(const Grabber::DevicePropertiesItem& v1, const Grabber::DevicePropertiesItem& v2); diff --git a/include/hyperhdrbase/GrabberWrapper.h b/include/hyperhdrbase/GrabberWrapper.h index 24712f122..fe663c1b1 100644 --- a/include/hyperhdrbase/GrabberWrapper.h +++ b/include/hyperhdrbase/GrabberWrapper.h @@ -66,6 +66,8 @@ class GrabberWrapper : public QObject int getFpsSoftwareDecimation(); int getActualFps(); + + void revive(); public slots: void newFrame(const Image& image); @@ -118,4 +120,5 @@ public slots: int _cecHdrStart; int _cecHdrStop; + bool _autoResume; }; diff --git a/include/hyperhdrbase/VideoControl.h b/include/hyperhdrbase/VideoControl.h index 50016680e..344cbc371 100644 --- a/include/hyperhdrbase/VideoControl.h +++ b/include/hyperhdrbase/VideoControl.h @@ -65,4 +65,6 @@ private slots: QString _usbCaptName; QTimer _usbInactiveTimer; bool _isCEC; + + static bool _stream; }; diff --git a/libsrc/hyperhdrbase/DetectionAutomatic.cpp b/libsrc/hyperhdrbase/DetectionAutomatic.cpp index 6d005e2ce..ed33210f2 100644 --- a/libsrc/hyperhdrbase/DetectionAutomatic.cpp +++ b/libsrc/hyperhdrbase/DetectionAutomatic.cpp @@ -571,3 +571,8 @@ bool DetectionAutomatic::checkSignal(Image& image) return true; } + +bool DetectionAutomatic::getDetectionAutoSignal() +{ + return _noSignal; +} diff --git a/libsrc/hyperhdrbase/DetectionManual.cpp b/libsrc/hyperhdrbase/DetectionManual.cpp index 264b7094c..66c6218e2 100644 --- a/libsrc/hyperhdrbase/DetectionManual.cpp +++ b/libsrc/hyperhdrbase/DetectionManual.cpp @@ -84,3 +84,8 @@ void DetectionManual::setSignalDetectionOffset(double horizontalMin, double vert Debug(_log, "Signal detection area set to: %f,%f x %f,%f", _x_frac_min, _y_frac_min, _x_frac_max, _y_frac_max); } + +bool DetectionManual::getDetectionManualSignal() +{ + return !_noSignalDetected; +} diff --git a/libsrc/hyperhdrbase/Grabber.cpp b/libsrc/hyperhdrbase/Grabber.cpp index 5d94e52a5..4322e4dfc 100644 --- a/libsrc/hyperhdrbase/Grabber.cpp +++ b/libsrc/hyperhdrbase/Grabber.cpp @@ -42,6 +42,7 @@ Grabber::Grabber(const QString& grabberName, int width, int height, int cropLeft , _frameByteSize(-1) , _signalDetectionEnabled(false) , _signalAutoDetectionEnabled(false) + , _synchro(1) { Grabber::setCropping(cropLeft, cropRight, cropTop, cropBottom); } @@ -570,3 +571,33 @@ void Grabber::setAutoSignalDetectionEnable(bool enable) Info(_log, "Automatic signal detection is now %s", enable ? "enabled" : "disabled"); } } + +void Grabber::revive() +{ + bool checkSignal = false; + + if (_signalAutoDetectionEnabled) + { + checkSignal = getDetectionAutoSignal(); + } + else if (_signalDetectionEnabled) + { + checkSignal = getDetectionManualSignal(); + } + + if (checkSignal) + { + Warning(_log, "The video control requested for the grabber restart due to signal lost, but it's caused by signal detection. No restart."); + return; + } + + if (_synchro.tryAcquire()) + { + Warning(_log, "The video control requested for the grabber restart due to signal lost"); + stop(); + start(); + _synchro.release(); + } + else + Warning(_log, "The video control requested for the grabber restart due to signal lost, but other instance already handled it"); +} diff --git a/libsrc/hyperhdrbase/GrabberWrapper.cpp b/libsrc/hyperhdrbase/GrabberWrapper.cpp index 55dfaeb29..e25a881cd 100644 --- a/libsrc/hyperhdrbase/GrabberWrapper.cpp +++ b/libsrc/hyperhdrbase/GrabberWrapper.cpp @@ -20,6 +20,7 @@ GrabberWrapper::GrabberWrapper(const QString& grabberName, Grabber* ggrabber) , _grabber(ggrabber) , _cecHdrStart(0) , _cecHdrStop(0) + , _autoResume(false) { GrabberWrapper::instance = this; @@ -343,6 +344,12 @@ DetectionAutomatic::calibrationPoint GrabberWrapper::parsePoint(int width, int h return p; } +void GrabberWrapper::revive() +{ + if (_grabber != nullptr && _autoResume) + QMetaObject::invokeMethod(_grabber, "revive", Qt::QueuedConnection); +} + void GrabberWrapper::handleSettingsUpdate(settings::type type, const QJsonDocument& config) { if (type == settings::type::VIDEODETECTION && _grabber != nullptr) @@ -396,6 +403,13 @@ void GrabberWrapper::handleSettingsUpdate(settings::type type, const QJsonDocume // extract settings const QJsonObject& obj = config.object(); + // auto resume + if (_autoResume != obj["autoResume"].toBool(false)) + { + _autoResume = obj["autoResume"].toBool(false); + Debug(_log, "Auto resume is: %s",(_autoResume)?"enabled":"disabled"); + } + // crop for video _grabber->setCropping( obj["cropLeft"].toInt(0), diff --git a/libsrc/hyperhdrbase/VideoControl.cpp b/libsrc/hyperhdrbase/VideoControl.cpp index e892a0b3b..2d386213e 100644 --- a/libsrc/hyperhdrbase/VideoControl.cpp +++ b/libsrc/hyperhdrbase/VideoControl.cpp @@ -2,12 +2,16 @@ #include +#include + // utils includes #include // qt includes #include +bool VideoControl::_stream = false; + VideoControl::VideoControl(HyperHdrInstance* hyperhdr) : QObject() , _hyperhdr(hyperhdr) @@ -41,6 +45,7 @@ bool VideoControl::isCEC() void VideoControl::handleUsbImage(const QString& name, const Image & image) { + _stream = true; if(_usbCaptName != name) { _hyperhdr->registerInput(_usbCaptPrio, hyperhdr::COMP_VIDEOGRABBER, "System", name); @@ -103,6 +108,15 @@ void VideoControl::handleCompStateChangeRequest(hyperhdr::Components component, void VideoControl::setUsbInactive() { if (!_alive) + { _hyperhdr->setInputInactive(_usbCaptPrio); + + if (_stream) + { + _stream = false; + if (GrabberWrapper::getInstance()) + GrabberWrapper::getInstance()->revive(); + } + } _alive = false; } diff --git a/libsrc/hyperhdrbase/schema/schema-videoGrabber.json b/libsrc/hyperhdrbase/schema/schema-videoGrabber.json index 5323161f4..c532b00a9 100644 --- a/libsrc/hyperhdrbase/schema/schema-videoGrabber.json +++ b/libsrc/hyperhdrbase/schema/schema-videoGrabber.json @@ -215,7 +215,16 @@ } }, "propertyOrder" : 53 - }, + }, + "autoResume" : + { + "type" : "boolean", + "format": "checkbox", + "title" : "edt_conf_stream_autoResume_title", + "default" : false, + "required" : true, + "propertyOrder" : 54 + }, "autoSignalDetection" : { "type" : "boolean", @@ -223,7 +232,7 @@ "title" : "edt_conf_stream_automatic_signalDetection_title", "default" : false, "required" : true, - "propertyOrder" : 54 + "propertyOrder" : 55 }, "saveResources" : { @@ -237,7 +246,7 @@ "autoSignalDetection": true } }, - "propertyOrder" : 55 + "propertyOrder" : 56 }, "errorTolerance" : { @@ -253,7 +262,7 @@ "autoSignalDetection": true } }, - "propertyOrder" : 56 + "propertyOrder" : 57 }, "modelTolerance" : { @@ -271,7 +280,7 @@ "autoSignalDetection": true } }, - "propertyOrder" : 57 + "propertyOrder" : 58 }, "sleepTime" : { @@ -288,7 +297,7 @@ "autoSignalDetection": true } }, - "propertyOrder" : 58 + "propertyOrder" : 59 }, "wakeTime" : { @@ -305,7 +314,7 @@ "autoSignalDetection": true } }, - "propertyOrder" : 59 + "propertyOrder" : 60 }, "signalDetection" : { @@ -319,7 +328,7 @@ "autoSignalDetection": false } }, - "propertyOrder" : 60 + "propertyOrder" : 61 }, "redSignalThreshold" : { @@ -336,7 +345,7 @@ } }, "required" : true, - "propertyOrder" : 61 + "propertyOrder" : 62 }, "greenSignalThreshold" : { @@ -353,7 +362,7 @@ } }, "required" : true, - "propertyOrder" : 62 + "propertyOrder" : 63 }, "blueSignalThreshold" : { @@ -370,7 +379,7 @@ } }, "required" : true, - "propertyOrder" : 63 + "propertyOrder" : 64 }, "noSignalCounterThreshold" : { @@ -386,7 +395,7 @@ } }, "required" : true, - "propertyOrder" : 64 + "propertyOrder" : 65 }, "sDVOffsetMin" : { @@ -403,7 +412,7 @@ } }, "required" : true, - "propertyOrder" : 65 + "propertyOrder" : 66 }, "sDVOffsetMax" : { @@ -420,7 +429,7 @@ } }, "required" : true, - "propertyOrder" : 66 + "propertyOrder" : 67 }, "sDHOffsetMin" : { @@ -437,7 +446,7 @@ } }, "required" : true, - "propertyOrder" : 67 + "propertyOrder" : 68 }, "sDHOffsetMax" : { @@ -454,7 +463,7 @@ } }, "required" : true, - "propertyOrder" : 68 + "propertyOrder" : 69 } }, "additionalProperties" : false diff --git a/version b/version index f41d2f325..52820dc1b 100644 --- a/version +++ b/version @@ -1 +1 @@ -17.0.0.0beta +17.0.0.0beta2