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 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-25 13:08:01 +02:00
parent 59c83b2c70 f3cc9f75a2
commit 8474ef8c98
16 changed files with 71 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -850,6 +850,7 @@ std::string CNeutrinoYParser::func_get_partition_list(CyhookHandler *, std::str
//-------------------------------------------------------------------------
std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
{
#if 0
unsigned int system_rev = cs_get_revision();
std::string boxname = "CST ";
@@ -905,7 +906,15 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
boxname += buffer;
break;
}
#else
std::string boxname = g_info.hw_caps->boxvendor;
if (boxname.compare("Coolstream") == 0)
boxname = "CST"; /* that's more or less an external API... */
boxname += " " + std::string(g_info.hw_caps->boxname);
if (!strcmp(g_info.hw_caps->boxname, "Neo") &&
CFEManager::getInstance()->getFrontendCount() > 1)
boxname += " Twin";
#endif
return boxname;
}
//-------------------------------------------------------------------------
@@ -913,6 +922,7 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
//-------------------------------------------------------------------------
std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string)
{
#if 0
unsigned int system_rev = cs_get_revision();
std::string boxmodel = "Unknown";
@@ -945,7 +955,9 @@ std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string)
default:
break;
}
#else
std::string boxmodel = std::string(g_info.hw_caps->boxarch);
#endif
return boxmodel;
}
//-------------------------------------------------------------------------