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

yweb: fix remotecontrol; remove dependency from MAC

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8131a25af1
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-19 (Mon, 19 Nov 2012)

Origin message was:
------------------
- yweb: fix remotecontrol; remove dependency from MAC

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2012-11-19 22:33:50 +01:00
parent 629cc6837e
commit 49e7d1904d
3 changed files with 58 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -595,15 +595,14 @@ void CControlAPI::InfoCGI(CyhookHandler *hh)
void CControlAPI::HWInfoCGI(CyhookHandler *hh)
{
unsigned int system_rev = cs_get_revision();
std::string boxname;
std::string boxname = "Coolstream ";
static CNetAdapter netadapter;
std::string eth_id = netadapter.getMacAddr();
std::transform(eth_id.begin(), eth_id.end(), eth_id.begin(), ::tolower);
if("00:c5:5c" == eth_id.substr(0, 8) )
boxname = "Coolstream ";
else if("ba:dd:ad" == eth_id.substr(0, 8) )
#if HAVE_TRIPLEDRAGON
boxname = "Armas ";
#endif
switch(system_rev)
{
@@ -625,14 +624,14 @@ void CControlAPI::HWInfoCGI(CyhookHandler *hh)
boxname += "Zee";
break;
default: {
default:
char buffer[10];
snprintf(buffer, sizeof(buffer), "%u\n", system_rev);
boxname += "Unknown nr. ";
boxname += buffer;
}
break;
}
boxname += (g_info.delivery_system == DVB_S || (system_rev == 1)) ? " SAT":" CABLE";
hh->printf("%s\nMAC:%s\n", boxname.c_str(),eth_id.c_str());

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

@@ -647,20 +647,16 @@ std::string CNeutrinoYParser::func_get_partition_list(CyhookHandler *, std::str
return yresult;
}
//-------------------------------------------------------------------------
// y-func : get boxtypetext (Nokia, Philips, Sagem)
// y-func : get boxtypetext
//-------------------------------------------------------------------------
std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
{
unsigned int system_rev = cs_get_revision();
std::string boxname;
static CNetAdapter netadapter;
std::string eth_id = netadapter.getMacAddr();
std::transform(eth_id.begin(), eth_id.end(), eth_id.begin(), ::tolower);
std::string boxname = "Coolstream ";
if("00:c5:5c" == eth_id.substr(0, 8) )
boxname = "Coolstream ";
else if("ba:dd:ad" == eth_id.substr(0, 8) )
#if HAVE_TRIPLEDRAGON
boxname = "Armas ";
#endif
switch(system_rev)
{
@@ -682,12 +678,11 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
boxname += "Zee";
break;
default: {
default:
char buffer[10];
snprintf(buffer, sizeof(buffer), "%u\n", system_rev);
boxname += "Unknown nr. ";
boxname += buffer;
}
break;
}

4
src/nhttpd/web/Y_Version.txt
View File

@@ -1,4 +1,4 @@
version=2.8.0.30
date=18.08.2012
version=2.8.0.31
date=19.11.2012
type=Release
info=Port Coolstream