mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- neutrinoyparser: remove delivery_system from boxname

Browse Source
This commit is contained in:
svenhoefer
2014-03-26 12:45:18 +01:00
parent d81b50523c
commit d4dc3fcbbd
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -686,7 +686,7 @@ std::string CNeutrinoYParser::func_get_partition_list(CyhookHandler *, std::str
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// y-func : get boxtypetext // y-func : get boxtypetext
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string) std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
{ {
unsigned int system_rev = cs_get_revision(); unsigned int system_rev = cs_get_revision();
std::string boxname = "CST "; std::string boxname = "CST ";
@@ -730,8 +730,6 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
break; break;
} }
if (system_rev != 9) // don't add delivery_system for Tank
boxname += (g_info.delivery_system == DVB_S || (system_rev == 1)) ? " SAT":" CABLE";
return boxname; return boxname;
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------

18
src/nhttpd/web/Y_Blocks.txt
View File

@@ -501,18 +501,14 @@ start-block~remote
{=if-equal:{=var-get:yfbtype=}~0~ {=if-equal:{=var-get:yfbtype=}~0~
{=if-equal:{=var-get:nfbtype=}~2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~ {=if-equal:{=var-get:nfbtype=}~2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~
{=if-equal:{=var-get:nfbtype=}~1~ {=include-block:Y_Blocks.txt;rc_dbox_nokia_old=}~ {=if-equal:{=var-get:nfbtype=}~1~ {=include-block:Y_Blocks.txt;rc_dbox_nokia_old=}~
{=if-equal:{=var-get:boxtype=}~CST Neo SAT~ {=include-block:Y_Blocks.txt;rc_cst_v2=}~ {=if-equal:{=var-get:boxtype=}~CST Neo~ {=include-block:Y_Blocks.txt;rc_cst_v2=}~
{=if-equal:{=var-get:boxtype=}~CST Neo CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v2=}~ {=if-equal:{=var-get:boxtype=}~CST Zee~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~
{=if-equal:{=var-get:boxtype=}~CST Zee SAT~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~ {=if-equal:{=var-get:boxtype=}~CST Neo Twin~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
{=if-equal:{=var-get:boxtype=}~CST Zee CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~ {=if-equal:{=var-get:boxtype=}~CST Tank~ {=include-block:Y_Blocks.txt;rc_cst_v5=}~
{=if-equal:{=var-get:boxtype=}~CST Neo Twin SAT~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~ {=if-equal:{=var-get:boxtype=}~CST Trinity~ {=include-block:Y_Blocks.txt;rc_cst_v6=}~
{=if-equal:{=var-get:boxtype=}~CST Neo Twin CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
{=if-equal:{=var-get:boxtype=}~CST Tank~ {=include-block:Y_Blocks.txt;rc_cst_v5=}~
{=if-equal:{=var-get:boxtype=}~CST Trinity SAT~ {=include-block:Y_Blocks.txt;rc_cst_v6=}~
{=if-equal:{=var-get:boxtype=}~CST Trinity CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v6=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=} {=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
=}=}=}=}=}=}=}=}=} =}=}=}=}=}
=}=} =}=}
~ ~
{=if-equal:{=var-get:yfbtype=}~-2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~ {=if-equal:{=var-get:yfbtype=}~-2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~