Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 356f0073b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)


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

------------------
This commit was generated by Migit

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;
 

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>

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>

data/y-web/languages/Deutsch

@@ -150,6 +150,7 @@ bc.screenshot.delete=Schnappschuss lö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

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

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;