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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-12 22:17:17 +01:00
parent 826d527841 b9b5808928
commit afda007d95
46 changed files with 220 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -864,7 +864,7 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
if( boxname == "Armas ")
boxname += "TripleDragon";
break;
#ifdef BOXMODEL_NEVIS
#ifdef BOXMODEL_CS_HD1
case 6:
boxname += "HD1";
break;
@@ -880,7 +880,7 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
boxname += "Zee";
break;
#endif
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
case 9:
boxname += "Tank";
break;
@@ -928,7 +928,7 @@ std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string)
switch(system_rev)
{
#ifdef BOXMODEL_NEVIS
#ifdef BOXMODEL_CS_HD1
case 6:
case 7:
case 8:
@@ -936,7 +936,7 @@ std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string)
boxmodel = "Nevis";
break;
#endif
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
case 9:
boxmodel = "Apollo";
break;