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

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

Browse Source 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed38125791
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-19 01:07:17 +01:00
parent 42821934cd a833003150
commit 2aa18cd5e1
8 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -823,7 +823,15 @@ void CControlAPI::HWInfoCGI(CyhookHandler *hh)
std::string eth_id = netadapter.getMacAddr();
std::transform(eth_id.begin(), eth_id.end(), eth_id.begin(), ::tolower);
hh->printf("%s %s (%s)\nMAC:%s\n", g_info.hw_caps->boxvendor, g_info.hw_caps->boxname, g_info.hw_caps->boxarch, eth_id.c_str());
std::string boxvendor(g_info.hw_caps->boxvendor);
/*
I don't know the current legal situation.
So better let's change the vendor's name to CST.
*/
if (boxvendor.compare("Coolstream") == 0)
boxvendor = "CST";
hh->printf("%s %s (%s)\nMAC:%s\n", boxvendor.c_str(), g_info.hw_caps->boxname, g_info.hw_caps->boxarch, eth_id.c_str());
}
//-----------------------------------------------------------------------------
void CControlAPI::ShutdownCGI(CyhookHandler *hh)

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

@@ -851,14 +851,16 @@ std::string CNeutrinoYParser::func_get_partition_list(CyhookHandler *, std::str
std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
{
std::string boxvendor(g_info.hw_caps->boxvendor);
/* stay compatible with present code in Y_Blocks.txt */
/*
I don't know the current legal situation.
So better let's change the vendor's name to CST.
After change this, you'll have to align code in Y_Blocks.txt
*/
if (boxvendor.compare("Coolstream") == 0)
boxvendor = "CST";
std::string boxname(g_info.hw_caps->boxname);
/* workaround for Neo2 */
if ((boxname.compare("Neo") == 0) && (CFEManager::getInstance()->getFrontendCount() > 1))
boxname += " Twin";
return boxvendor + " " + boxname;
}