From aa0920d8074c582c2481758d838f78a0de366758 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Thu, 13 Jun 2013 11:43:40 +0200 Subject: [PATCH] - yweb: use more matching zee-remotecontrol for neo twin --- src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 2 ++ src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp | 2 ++ src/nhttpd/web/Y_Blocks.txt | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp index d67eb5caf..c1a8ed2d2 100644 --- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp @@ -625,6 +625,8 @@ void CControlAPI::HWInfoCGI(CyhookHandler *hh) case 8: case 9: boxname += "Neo"; + if (CFEManager::getInstance()->getFrontendCount() > 1) + boxname += " Twin"; break; case 10: boxname += "Zee"; diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp index b099cebf4..9ea0ebaaf 100644 --- a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp @@ -694,6 +694,8 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string) case 8: case 9: boxname += "Neo"; + if (CFEManager::getInstance()->getFrontendCount() > 1) + boxname += " Twin"; break; case 10: boxname += "Zee"; diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt index c887e2822..7894b0ca4 100644 --- a/src/nhttpd/web/Y_Blocks.txt +++ b/src/nhttpd/web/Y_Blocks.txt @@ -496,7 +496,13 @@ end-block~frame_live_epg # ------- Remote start-block~remote -{=if-equal:CST Neo SAT~{=if-equal:{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;default=}~default~{=func:get_boxtype=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;default=}=}~{=include-block:Y_Blocks.txt;remote_neo=}~{=if-equal:{=func:get_boxtype=}~CST Neo CABLE~{=include-block:Y_Blocks.txt;remote_neo=}~{=if-equal:{=func:get_boxtype=}~CST Zee SAT~{=include-block:Y_Blocks.txt;remote_zee=}~{=if-equal:{=func:get_boxtype=}~CST Zee CABLE~{=include-block:Y_Blocks.txt;remote_zee=}~{=include-block:Y_Blocks.txt;remote_hd1=}=}=}=}=} +{=if-equal:CST Neo SAT~{=if-equal:{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;default=}~default~{=func:get_boxtype=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;default=}=}~{=include-block:Y_Blocks.txt;remote_neo=}~ + {=if-equal:{=func:get_boxtype=}~CST Neo CABLE~{=include-block:Y_Blocks.txt;remote_neo=}~ + {=if-equal:{=func:get_boxtype=}~CST Zee SAT~{=include-block:Y_Blocks.txt;remote_zee=}~ + {=if-equal:{=func:get_boxtype=}~CST Zee CABLE~{=include-block:Y_Blocks.txt;remote_zee=}~ + {=if-equal:{=func:get_boxtype=}~CST Neo Twin SAT~{=include-block:Y_Blocks.txt;remote_zee=}~ + {=if-equal:{=func:get_boxtype=}~CST Neo Twin CABLE~{=include-block:Y_Blocks.txt;remote_zee=}~ +{=include-block:Y_Blocks.txt;remote_hd1=}=}=}=}=}=}=} end-block~remote # ------- Remote Coolstream Neo