mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	acinclude.m4
	configure.ac
	data/fonts/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	data/webtv/Makefile.am
	data/y-web/Y_Tools_Boxcontrol.yhtm
	data/y-web/Y_Tools_Screenshot.yhtm
	lib/hardware/coolstream/hardware_caps.h
	lib/libtuxtxt/tuxtxt_common.h
	src/gui/audioplayer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/gui/network_setup.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: ae4307bc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
This commit is contained in:
vanhofen
2017-11-02 23:25:41 +01:00
parent 548eaef43f dbe8dcc351
commit 6bda6dbce7
76 changed files with 4545 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
data/y-web/Y_Blocks.txt
View File

@@ -535,9 +535,11 @@ start-block~remote
{=if-equal:{=var-get:boxtype=}~CST Zee2~ {=include-block:Y_Blocks.txt;rc_cst_v6=}~
{=if-equal:{=var-get:boxtype=}~CST Link~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
{=if-equal:{=var-get:boxtype=}~CST Trinity Duo~ {=include-block:Y_Blocks.txt;rc_cst_v6=}~
{=if-equal:{=var-get:boxtype=}~AX-Technologies HD51~{=include-block:Y_Blocks.txt;rc_ax_hd51=}~
{=if-equal:{=var-get:boxtype=}~Mutant HD51~ {=include-block:Y_Blocks.txt;rc_mutant_hd51=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
=}=}=}=}=}=}=}=}
=}=}=}=}=}=}=}=}=}=}
=}=}
~
{=if-equal:{=var-get:yfbtype=}~-2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~
@@ -550,9 +552,11 @@ start-block~remote
{=if-equal:{=var-get:yfbtype=}~6~ {=include-block:Y_Blocks.txt;rc_cst_v6=}~
{=if-equal:{=var-get:yfbtype=}~7~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
{=if-equal:{=var-get:yfbtype=}~8~ {=include-block:Y_Blocks.txt;rc_cst_v6=}~
{=if-equal:{=var-get:yfbtype=}~9~ {=include-block:Y_Blocks.txt;rc_ax_hd51=}~
{=if-equal:{=var-get:yfbtype=}~10~ {=include-block:Y_Blocks.txt;rc_mutant_hd51=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
=}=}=}=}=}=}=}=}=}=}
=}=}=}=}=}=}=}=}=}=}=}=}
=}
end-block~remote
@@ -948,3 +952,115 @@ start-block~rc_dbox_philips
<area shape="circle" href="javascript:rcsim('KEY_1')" coords="37,284,12" />
</map>
end-block~rc_dbox_philips
# ------ Remote AX HD51
start-block~rc_ax_hd51
<img src="images/rc_ax_hd51.png" usemap="#rc"/>
<map name="rc" id="rc">
<area shape="rect" coords="20,43,49,72" href="javascript:rcsim('KEY_POWER')" />
<area shape="rect" coords="121,44,148,72" href="javascript:rcsim('KEY_MUTE')" />
<area shape="rect" coords="21,80,49,101" href="javascript:rcsim('KEY_SLEEP')"/>
<area shape="rect" coords="55,80,81,100" href="javascript:rcsim('KEY_TV')" />
<area shape="rect" coords="88,80,114,98" href="javascript:rcsim('KEY_RADIO')" />
<area shape="rect" coords="122,81,146,98" href="javascript:rcsim('KEY_HELP')" />
<area shape="rect" coords="21,109,54,132" href="javascript:rcsim('KEY_AUDIO')" />
<!-- area shape="rect" coords="69,109,101,130" alt="subtitle" / -->
<area shape="rect" coords="115,111,146,130" href="javascript:rcsim('KEY_TEXT')" />
<area shape="rect" coords="23,142,55,163" href="javascript:rcsim('KEY_1')" />
<area shape="rect" coords="68,141,101,163" href="javascript:rcsim('KEY_2')" />
<area shape="rect" coords="117,142,147,161" href="javascript:rcsim('KEY_3')" />
<area shape="rect" coords="22,173,55,195" href="javascript:rcsim('KEY_4')" />
<area shape="rect" coords="68,172,102,195" href="javascript:rcsim('KEY_5')" />
<area shape="rect" coords="115,173,147,194" href="javascript:rcsim('KEY_6')" />
<area shape="rect" coords="21,204,56,227" href="javascript:rcsim('KEY_7')" />
<area shape="rect" coords="69,204,102,227" href="javascript:rcsim('KEY_8')" />
<area shape="rect" coords="114,205,147,226" href="javascript:rcsim('KEY_9')" />
<area shape="rect" coords="61,236,107,259" href="javascript:rcsim('KEY_0')" />
<area shape="rect" coords="20,268,43,290" href="javascript:rcsim('KEY_RED')" />
<area shape="rect" coords="57,269,76,291" href="javascript:rcsim('KEY_GREEN')" />
<area shape="rect" coords="92,270,111,290" href="javascript:rcsim('KEY_YELLOW')" />
<area shape="rect" coords="127,270,145,290" href="javascript:rcsim('KEY_BLUE')" />
<area shape="rect" coords="121,300,147,318" href="javascript:rcsim('KEY_INFO')" />
<area shape="rect" coords="20,299,49,317" href="javascript:rcsim('KEY_SETUP')" />
<area shape="rect" coords="21,235,56,259" href="javascript:rcsim('KEY_LEFT')" />
<area shape="rect" coords="113,237,147,258" href="javascript:rcsim('KEY_RIGHT')" />
<area shape="rect" coords="24,396,49,415" href="javascript:rcsim('KEY_HOME')" />
<area shape="rect" coords="121,397,146,415" href="javascript:rcsim('KEY_EPG')" />
<area shape="rect" coords="22,427,52,456" href="javascript:rcsim('KEY_VOLUMEUP')" />
<area shape="rect" coords="23,456,52,493" href="javascript:rcsim('KEY_VOLUMEDOWN')" />
<area shape="rect" coords="119,428,145,462" href="javascript:rcsim('KEY_PAGEUP')" />
<area shape="rect" coords="119,464,146,493" href="javascript:rcsim('KEY_PAGEDOWN')" />
<area shape="rect" coords="70,343,98,372" href="javascript:rcsim('KEY_OK')" />
<area shape="rect" coords="70,468,99,489" href="javascript:rcsim('KEY_FAVORITES')" />
<!-- area shape="rect" coords="68,430,101,453" alt="context" / -->
<area shape="rect" coords="69,517,99,532" href="javascript:rcsim('KEY_RECORD')" />
<area shape="rect" coords="67,541,100,559" href="javascript:rcsim('KEY_TIME')" />
<area shape="rect" coords="24,513,56,534" href="javascript:rcsim('KEY_PREVIOUS')" />
<area shape="rect" coords="115,516,143,532" href="javascript:rcsim('KEY_NEXT')" />
<area shape="rect" coords="25,539,54,559" href="javascript:rcsim('KEY_REWIND')" />
<area shape="rect" coords="117,542,142,559" href="javascript:rcsim('KEY_FORWARD')" />
<area shape="rect" coords="24,565,57,584" href="javascript:rcsim('KEY_STOP')" />
<area shape="rect" coords="115,566,142,584" href="javascript:rcsim('KEY_PLAY')" />
<area shape="rect" coords="68,566,101,585" href="javascript:rcsim('KEY_PAUSE')" />
<area shape="poly" coords="58,321,86,312,113,324,110,324,96,338,66,337,67,337,58,324,58,323,59,323,60,322" href="javascript:rcsim('KEY_UP')" />
<area shape="poly" coords="107,344,122,333,129,362,117,383,105,376,108,346" href="javascript:rcsim('KEY_RIGHT')" />
<area shape="poly" coords="70,378,100,384,111,396,75,404,56,389,68,377" href="javascript:rcsim('KEY_DOWN')" />
<area shape="poly" coords="47,330,63,351,65,373,46,385,35,355" href="javascript:rcsim('KEY_LEFT')" />
</map>
end-block~rc_ax_hd51
# ------ Remote Mutant HD51
start-block~rc_mutant_hd51
<img src="images/rc_mutant_hd51.png" usemap="#rc"/>
<map name="rc" id="rc">
<area shape="rect" coords="18,24,53,48" href="javascript:rcsim('KEY_POWER')" />
<area shape="rect" coords="121,21,148,47" href="javascript:rcsim('KEY_MUTE')" />
<area shape="rect" coords="18,63,45,80" href="javascript:rcsim('KEY_SLEEP')" />
<area shape="rect" coords="52,63,80,80" href="javascript:rcsim('KEY_TV')" />
<area shape="rect" coords="87,63,114,80" href="javascript:rcsim('KEY_RADIO')" />
<area shape="rect" coords="121,63,148,80" href="javascript:rcsim('KEY_HELP')" />
<area shape="rect" coords="20,90,55,111" href="javascript:rcsim('KEY_AUDIO')" />
<!-- area shape="rect" coords="65,90,102,111" alt="subtitle" / -->
<area shape="rect" coords="111,90,148,111" href="javascript:rcsim('KEY_TEXT')" />
<area shape="rect" coords="20,121,55,144" href="javascript:rcsim('KEY_1')" />
<area shape="rect" coords="65,121,102,144" href="javascript:rcsim('KEY_2')" />
<area shape="rect" coords="111,121,148,144" href="javascript:rcsim('KEY_3')" />
<area shape="rect" coords="20,152,55,177" href="javascript:rcsim('KEY_4')" />
<area shape="rect" coords="65,152,102,177" href="javascript:rcsim('KEY_5')" />
<area shape="rect" coords="111,152,148,177" href="javascript:rcsim('KEY_6')" />
<area shape="rect" coords="20,185,55,207" href="javascript:rcsim('KEY_7')" />
<area shape="rect" coords="65,185,102,207" href="javascript:rcsim('KEY_8')" />
<area shape="rect" coords="111,185,148,207" href="javascript:rcsim('KEY_9')" />
<area shape="rect" coords="20,216,55,240" href="javascript:rcsim('KEY_LEFT')" />
<area shape="rect" coords="65,216,102,240" href="javascript:rcsim('KEY_0')" />
<area shape="rect" coords="111,216,148,240" href="javascript:rcsim('KEY_RIGHT')" />
<area shape="rect" coords="18,473,41,487" href="javascript:rcsim('KEY_RED')" />
<area shape="rect" coords="54,473,75,487" href="javascript:rcsim('KEY_GREEN')" />
<area shape="rect" coords="90,473,112,487" href="javascript:rcsim('KEY_YELLOW')" />
<area shape="rect" coords="124,473,148,487" href="javascript:rcsim('KEY_BLUE')" />
<area shape="rect" coords="20,251,39,274" href="javascript:rcsim('KEY_SETUP')" />
<area shape="rect" coords="127,251,149,274" href="javascript:rcsim('KEY_INFO')" />
<area shape="rect" coords="20,345,39,368" href="javascript:rcsim('KEY_HOME')" />
<area shape="rect" coords="127,345,149,368" href="javascript:rcsim('KEY_EPG')" />
<area shape="rect" coords="20,384,53,414" href="javascript:rcsim('KEY_VOLUMEUP')" />
<area shape="rect" coords="20,424,53,452" href="javascript:rcsim('KEY_VOLUMEDOWN')" />
<area shape="rect" coords="115,384,148,414" href="javascript:rcsim('KEY_PAGEUP')" />
<area shape="rect" coords="115,424,148,452" href="javascript:rcsim('KEY_PAGEDOWN')" />
<area shape="rect" coords="27,294,55,322" href="javascript:rcsim('KEY_LEFT')" />
<area shape="rect" coords="111,294,138,322" href="javascript:rcsim('KEY_RIGHT')" />
<area shape="rect" coords="62,267,104,291" href="javascript:rcsim('KEY_UP')" />
<area shape="rect" coords="62,329,104,353" href="javascript:rcsim('KEY_DOWN')" />
<area shape="rect" coords="65,299,103,318" href="javascript:rcsim('KEY_OK')" />
<area shape="rect" coords="65,429,102,449" href="javascript:rcsim('KEY_FAVORITES')" />
<!-- area shape="rect" coords="65,390,102,408" alt="portal" / -->
<area shape="rect" coords="18,500,41,516" href="javascript:rcsim('KEY_RECORD')" />
<area shape="rect" coords="54,500,75,516" href="javascript:rcsim('KEY_STOP')" />
<area shape="rect" coords="90,500,112,516" href="javascript:rcsim('KEY_PLAY')" />
<area shape="rect" coords="124,500,148,516" href="javascript:rcsim('KEY_TIME')" />
<area shape="rect" coords="18,528,41,543" href="javascript:rcsim('KEY_PREVIOUS')" />
<area shape="rect" coords="54,528,75,543" href="javascript:rcsim('KEY_REWIND')" />
<area shape="rect" coords="90,528,112,543" href="javascript:rcsim('KEY_FORWARD')" />
<area shape="rect" coords="124,528,148,543" href="javascript:rcsim('KEY_NEXT')" />
<area shape="rect" coords="124,554,148,570" href="javascript:rcsim('KEY_PAUSE')" />
</map>
end-block~rc_mutant_hd51

4
data/y-web/Y_Settings_yWeb.yhtm
View File

@@ -40,6 +40,8 @@ function do_init(){
case "6": // cst trinity
case "7": // cst link
case "8": // cst trinity duo
case "9": // ax hd51
case "10": // mutant hd51
sel=(sel*1+val*1);
break;
default:
@@ -157,6 +159,8 @@ select {
<option value="6">CST HD-2 | Trinity</option>
<option value="7">CST HD-2 | Link</option>
<option value="8">CST HD-2 | Trinity Duo</option>
<option value="9">AX | HD51</option>
<option value="10">Mutant | HD51</option>
</select>
</td>
<td>{=L:set.yweb.screenshot_rc=}</td>

5
data/y-web/Y_Tools_Boxcontrol.yhtm
View File

@@ -104,5 +104,10 @@ function init() {
<div id="out"></div>
</div>
</div>
<script type="text/javascript">
//<![CDATA[
init();
window.setInterval("get_data();",5000);
//]]>
</body>
</html>

6
data/y-web/Y_Tools_Screenshot.yhtm
View File

@@ -49,11 +49,11 @@ function do_snapshot() {
if ("{=var-get:grab=}" != "")
{
if (enableOSD == 1 && enableVideo == 1)
dbox_exec_tools("fbshot grab -p /tmp/"+filename+".png");
dbox_exec_tools("fbshot grab -q -p /tmp/"+filename+".png");
else if (enableOSD == 1)
dbox_exec_tools("fbshot grab -p -o /tmp/"+filename+".png");
dbox_exec_tools("fbshot grab -q -p -o /tmp/"+filename+".png");
else if (enableVideo == 1)
dbox_exec_tools("fbshot grab -p -v /tmp/"+filename+".png");
dbox_exec_tools("fbshot grab -q -p -v /tmp/"+filename+".png");
}
else if ("{=var-get:fbshot=}" != "" && enableVideo == 0)
dbox_exec_tools("fbshot fbshot /tmp/"+filename+".png");

2
data/y-web/images/Makefile.am
View File

@@ -48,6 +48,7 @@ install_DATA = accept.png \
popup.png \
properties.png \
radio.png \
rc_ax_hd51.png \
rc_cst_v1.jpg \
rc_cst_v2.png \
rc_cst_v3.png \
@@ -56,6 +57,7 @@ install_DATA = accept.png \
rc_cst_v6.png \
rc_dbox_nokia_old.png \
rc_dbox_philips.png \
rc_mutant_hd51.png \
record.png \
reload.png \
remove.png \

BIN
data/y-web/images/rc_ax_hd51.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 170 KiB

BIN
data/y-web/images/rc_mutant_hd51.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 133 KiB