From 3a268e12c5b480a05a5b139c7a123758320d2a00 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <overx300@gmail.com>
Date: Mon, 16 Oct 2017 10:44:19 +0200
Subject: [PATCH 1/3] Revert "- libdvbsub: add missing free() call"

This reverts commit 3da19efe982bdf97e7d566aa4df986bd70adc14a.


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/0f8e614ee4f2f73b8e285f157ec3bfde087d6d6f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)



------------------
This commit was generated by Migit
---
 lib/libdvbsub/dvbsubtitle.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/libdvbsub/dvbsubtitle.cpp b/lib/libdvbsub/dvbsubtitle.cpp
index 5ec75dded..897f9fc49 100644
--- a/lib/libdvbsub/dvbsubtitle.cpp
+++ b/lib/libdvbsub/dvbsubtitle.cpp
@@ -139,7 +139,6 @@ void cDvbSubtitleBitmaps::Draw(int &min_x, int &min_y, int &max_x, int &max_y)
 #endif
 
 		CFrameBuffer::getInstance()->blit2FB(newdata, nw, nh, xoff, yoff, 0, 0);
-		free(newdata);
 
 		if(min_x > xoff)
 			min_x = xoff;

From e2e32e84279fe9d2d3cd191c47cd2e93bfb37ee1 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 16 Oct 2017 12:03:02 +0200
Subject: [PATCH 2/3] yWeb: signalize standby-mode in status-button's color;
 thx to fred_feuerstein

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/e4f29657ce6fffe2626b20940d07e146f34b6934
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)

Origin message was:
------------------
- yWeb: signalize standby-mode in status-button's color; thx to fred_feuerstein

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 data/y-web/Y_Tools_Boxcontrol.yhtm | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/data/y-web/Y_Tools_Boxcontrol.yhtm b/data/y-web/Y_Tools_Boxcontrol.yhtm
index c1723b6d5..701da8e01 100644
--- a/data/y-web/Y_Tools_Boxcontrol.yhtm
+++ b/data/y-web/Y_Tools_Boxcontrol.yhtm
@@ -15,10 +15,24 @@ function goUrl(_url){
 	}
 	$("out").update(res);
 }
+function set_btn_standby(){
+	var res = trim(loadSyncURL("/control/standby"));
+	var color = "red";
+	switch(res){
+		case "off": color = "green"; break;
+	}
+	$("btn_standby").setStyle({borderColor: color});
+}
 function standby(_standby){
 	var _cec = (document.getElementById('checkCEC').checked == true) ? "on" : "off";
 	goUrl("/control/standby?"+_standby+"&cec="+_cec);
 }
+function init() {
+	set_btn_standby();
+}
+function get_data() {
+	set_btn_standby();
+}
 //]]>
 </script>
 </head>
@@ -38,7 +52,7 @@ function standby(_standby){
 			<td>
 			<input type="button" value="{=L:on=}" onclick='standby("on");'/>
 			<input type="button" value="{=L:off=}" onclick='standby("off");'/>
-			<input type="button" value="{=L:bc.control.status=}" onclick='goUrl("/control/standby");'/>
+			<input type="button" value="{=L:bc.control.status=}" onclick='goUrl("/control/standby");' id="btn_standby"/>
 			CEC: <input id="checkCEC" name="checkCEC" type="checkbox" checked="checked"/>
 			</td>
 		</tr>
@@ -91,5 +105,10 @@ function standby(_standby){
 		<div id="out"></div>
 	</div>
 </div>
+<script type="text/javascript">
+//<![CDATA[
+	init();
+	window.setInterval("get_data();",5000);
+//]]>
 </body>
 </html>

From e63c34b00cfbc507089a078cff66ba944291497a Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 16 Oct 2017 16:43:15 +0200
Subject: [PATCH 3/3] yWeb: enable auto-reload of screenshots

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/9eb1060cbb14f6a29ed289b52c0214ffc67503e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)

Origin message was:
------------------
- yWeb: enable auto-reload of screenshots

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 data/y-web/Y_Main.css              |  4 ++--
 data/y-web/Y_Tools_Screenshot.yhtm | 24 ++++++++++++++++++++++--
 data/y-web/languages/Deutsch       |  1 +
 data/y-web/languages/English       |  1 +
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/data/y-web/Y_Main.css b/data/y-web/Y_Main.css
index 23b2ef9a2..316c10c2d 100644
--- a/data/y-web/Y_Main.css
+++ b/data/y-web/Y_Main.css
@@ -86,14 +86,14 @@ div {
 	margin:0;
 	padding:0;
 }
-input[type="text"]:focus,input[type="password"]:focus{
+input[type="text"]:focus,input[type="number"]:focus,input[type="password"]:focus{
 	border-top: 1px solid #666666;
 	border-left: 1px solid #666666;
 	margin: 0px;
 	background: #ffffcc;
 	
 }
-input[type="text"],input[type="password"],select{
+input[type="text"],input[type="number"],input[type="password"],select{
 	border: 1px solid #aaaaaa;
 	margin: 0px;
 
diff --git a/data/y-web/Y_Tools_Screenshot.yhtm b/data/y-web/Y_Tools_Screenshot.yhtm
index 7d8516db0..994daa60d 100644
--- a/data/y-web/Y_Tools_Screenshot.yhtm
+++ b/data/y-web/Y_Tools_Screenshot.yhtm
@@ -8,6 +8,8 @@
 //<![CDATA[
 var enableOSD;
 var enableVideo;
+var interval;
+
 function checkEnable() {
 	enableOSD	= (document.getElementById('checkOSD').checked == true)		? 1 : 0;
 	enableVideo	= (document.getElementById('checkVideo').checked == true)	? 1 : 0;
@@ -96,6 +98,13 @@ function do_switchrc_txt(){
 	else
 		$('switchrc').update("{=L:bc.control.remote=} {=L:hide=}");
 }
+
+function do_reload(){
+	if (document.getElementById("checkReload").checked)
+		interval = setInterval(do_snapshot, document.getElementById("inputReload").value + "000");
+	else
+		clearInterval(interval);
+}
 //]]>
 </script>
 </head>
@@ -113,7 +122,8 @@ function do_switchrc_txt(){
 			</div>
 			<div class="right">
 				<form onsubmit="do_snapshot(); return false">
-				{=L:filename=}: <input type="text" value="screenshot" id="filename" size="16" />
+				Reload: <input id="checkReload" name="checkReload" type="checkbox" /> <input type="number" value="15" id="inputReload" min="1" max="180" title="{=L:bc.screenshot.reload_desc=}" disabled />
+				{=L:filename=}: <input type="text" value="screenshot" id="filename" size="10" />
 				OSD: <input id="checkOSD" name="checkOSD" type="checkbox" {=if-empty:{=osd=}~~checked="checked"=} />
 				TV: <input id="checkVideo" name="checkVideo" type="checkbox" {=if-empty:{=video=}~~checked="checked"=} />
 				</form>
@@ -125,7 +135,6 @@ function do_switchrc_txt(){
 				{=L:bc.screenshot.wait_text=}
 		</div>
 		</div>
-
 		<table cellpadding="0" class="screenshot">
 		<tr>
 			<td id="remote" {=if-equal:{=rc=}~false~style="display: none"~=}>
@@ -138,5 +147,16 @@ function do_switchrc_txt(){
 		</table>
 	</div>
 </div>
+<script>
+document.getElementById('checkReload').onclick = function() {
+	if (this.checked ) {
+		intervall = setInterval(do_snapshot, document.getElementById("inputReload").value + "000");
+		document.getElementById("inputReload").disabled = false;
+	} else {
+		clearInterval(intervall);
+		document.getElementById("inputReload").disabled = true;
+	}
+};
+</script>
 </body>
 </html>
diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch
index fdd02bcd2..ca14350e7 100644
--- a/data/y-web/languages/Deutsch
+++ b/data/y-web/languages/Deutsch
@@ -150,6 +150,7 @@ bc.screenshot.delete=Schnappschuss l&ouml;schen
 bc.screenshot.zoom=Schnappschuss zoomen
 bc.screenshot.wait_text=Schnappschuss wird erstellt
 bc.screenshot.checkenable=OSD und/oder TV muss aktiviert sein!
+bc.screenshot.reload_desc=Reload-Intervall in Sekunden
 
 ========= Boxcontrol - Others
 bc.channels=Sender
diff --git a/data/y-web/languages/English b/data/y-web/languages/English
index d8bc53303..9469b377c 100644
--- a/data/y-web/languages/English
+++ b/data/y-web/languages/English
@@ -152,6 +152,7 @@ bc.screenshot.delete=Delete screenshot
 bc.screenshot.zoom=Zoom screenshot
 bc.screenshot.wait_text=Create screenshot
 bc.screenshot.checkenable=OSD and/or TV must be enabled!
+bc.screenshot.reload_desc=Reload interval in seconds
 
 ========= Boxcontrol - Others
 bc.channels=Channels