neutrinoyparser: remove delivery_system from boxname

Origin commit data
------------------
Branch: ni/coolstream
Commit: d4dc3fcbbd
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-26 (Wed, 26 Mar 2014)

Origin message was:
------------------
- neutrinoyparser: remove delivery_system from boxname

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2014-03-26 12:45:18 +01:00
parent 6a9ec9da39
commit 224246aa56
2 changed files with 8 additions and 14 deletions

View File

@@ -730,8 +730,6 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
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;
}
//-------------------------------------------------------------------------

View File

@@ -501,18 +501,14 @@ start-block~remote
{=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=}~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 CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v2=}~
{=if-equal:{=var-get:boxtype=}~CST Zee SAT~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~
{=if-equal:{=var-get:boxtype=}~CST Zee CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~
{=if-equal:{=var-get:boxtype=}~CST Neo Twin SAT~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
{=if-equal:{=var-get:boxtype=}~CST Neo Twin CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
{=if-equal:{=var-get:boxtype=}~CST Neo~ {=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 Neo Twin~ {=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=}~
{=if-equal:{=var-get:boxtype=}~CST Trinity~ {=include-block:Y_Blocks.txt;rc_cst_v6=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
=}=}=}=}=}=}=}=}=}
=}=}=}=}=}
=}=}
~
{=if-equal:{=var-get:yfbtype=}~-2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~