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

add hw info to func_get_boxtype, fixes

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@983 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bbbb40061
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-12-31 (Fri, 31 Dec 2010)

Origin message was:
------------------
-add hw info to func_get_boxtype, fixes

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@983 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-12-31 13:24:46 +00:00
parent cc9bbea8ba
commit da322f4b8f
5 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/cam_menu.cpp
View File

@@ -193,7 +193,7 @@ int CCAMMenuHandler::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t da
return ret; return ret;
} }
void CCAMMenuHandler::showHintBox (const neutrino_locale_t Caption, const char * const Text, uint32_t timeout) void CCAMMenuHandler::showHintBox (const neutrino_locale_t /*Caption*/, const char * const Text, uint32_t timeout)
{ {
hideHintBox(); hideHintBox();
hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, Text); hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, Text);

4
src/gui/widget/hintbox.cpp
View File

@@ -46,8 +46,8 @@
CHintBox::CHintBox(const neutrino_locale_t Caption, const char * const Text, const int Width, const char * const Icon) CHintBox::CHintBox(const neutrino_locale_t Caption, const char * const Text, const int Width, const char * const Icon)
{ {
const char * caption = g_Locale->getText(Caption); const char * caption_tmp = g_Locale->getText(Caption);
init(caption, Text, Width, Icon); init(caption_tmp, Text, Width, Icon);
} }
CHintBox::CHintBox(const char * const Caption, const char * const Text, const int Width, const char * const Icon) CHintBox::CHintBox(const char * const Caption, const char * const Text, const int Width, const char * const Icon)

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

@@ -586,7 +586,10 @@ void CControlAPI::HWInfoCGI(CyhookHandler *hh)
boxname = "Coolstream "; boxname = "Coolstream ";
switch(system_rev) switch(system_rev)
{ {
case 6: case 1:
boxname = "TripleDragon";
break;
case 6:
boxname += "HD1"; boxname += "HD1";
break; break;
case 7: case 7:
@@ -608,7 +611,7 @@ void CControlAPI::HWInfoCGI(CyhookHandler *hh)
} }
break; break;
} }
boxname += (g_info.delivery_system == DVB_S) ? " SAT":" CABLE"; boxname += (g_info.delivery_system == DVB_S || (system_rev == 1)) ? " SAT":" CABLE";
hh->printf("%s\n", boxname.c_str()); hh->printf("%s\n", boxname.c_str());

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

@@ -28,6 +28,7 @@
#include <zapit/channel.h> #include <zapit/channel.h>
#include <zapit/bouquets.h> #include <zapit/bouquets.h>
#include <cs_api.h>
extern tallchans allchans; extern tallchans allchans;
extern CBouquetManager *g_bouquetManager; extern CBouquetManager *g_bouquetManager;
@@ -652,7 +653,38 @@ std::string CNeutrinoYParser::func_get_partition_list(CyhookHandler *, std::str
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string) std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
{ {
return "Coolstream";//FIXME unsigned int system_rev = cs_get_revision();
std::string boxname;
boxname = "Coolstream ";
switch(system_rev)
{
case 1:
boxname = "TripleDragon";
break;
case 6:
boxname += "HD1";
break;
case 7:
boxname += "BSE";
break;
case 8:
case 9:
boxname += "Neo";
break;
case 10:
boxname += "Zee";
break;
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";
return boxname;
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// y-func : get stream info // y-func : get stream info

7
src/system/setting_helpers.cpp
View File

@@ -855,7 +855,8 @@ void testNetworkSettings(const char* ip, const char* netmask, const char* broadc
} }
else else
{ {
netGetIP("eth0", our_ip, our_mask, our_broadcast); char eth[] = "eth0";
netGetIP(eth, our_ip, our_mask, our_broadcast);
netGetDefaultRoute(our_gateway); netGetDefaultRoute(our_gateway);
netGetNameserver(our_nameserver); netGetNameserver(our_nameserver);
} }
@@ -908,8 +909,8 @@ void showCurrentNetworkSettings()
char router[16]; char router[16];
char nameserver[16]; char nameserver[16];
std::string text; std::string text;
char eth[] = "eth0";
netGetIP("eth0", ip, mask, broadcast); netGetIP(eth, ip, mask, broadcast);
if (ip[0] == 0) { if (ip[0] == 0) {
text = g_Locale->getText(LOCALE_NETWORKMENU_INACTIVE); text = g_Locale->getText(LOCALE_NETWORKMENU_INACTIVE);
} }