mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 10:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/next-cc'

Browse Source 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp
This commit is contained in:
Stefan Seyfried
2013-06-16 21:22:14 +02:00
parent 49f875508e 7097abe420
commit d5d5a60261
160 changed files with 6251 additions and 2072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -627,6 +627,8 @@ void CControlAPI::HWInfoCGI(CyhookHandler *hh)
case 8:
case 9:
boxname += "Neo";
if (CFEManager::getInstance()->getFrontendCount() > 1)
boxname += " Twin";
break;
case 10:
boxname += "Zee";

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

@@ -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";

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

@@ -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