mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-03 10:51:12 +02:00
- network menu (#264)
- tune timeout (#266) - satfinder (#269) - tuxtxt: new monospace font to support more languages option to select teletext font charset selection from pmt more menu languages from tuxbox cvs cleanup sutitiles start screen needs testing. git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@486 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -29,12 +29,30 @@
|
||||
CNetworkConfig::CNetworkConfig(void)
|
||||
{
|
||||
char our_nameserver[16];
|
||||
|
||||
netGetNameserver(our_nameserver);
|
||||
nameserver = our_nameserver;
|
||||
inet_static = getInetAttributes("eth0", automatic_start, address, netmask, broadcast, gateway);
|
||||
|
||||
init_vars();
|
||||
copy_to_orig();
|
||||
}
|
||||
|
||||
void CNetworkConfig::init_vars(void)
|
||||
{
|
||||
char mask[16];
|
||||
char _broadcast[16];
|
||||
char router[16];
|
||||
char ip[16];
|
||||
|
||||
netGetDefaultRoute(router);
|
||||
gateway = router;
|
||||
netGetIP((char *) "eth0", ip, mask, _broadcast);
|
||||
netmask = mask;
|
||||
broadcast = _broadcast;
|
||||
address = ip;
|
||||
}
|
||||
|
||||
void CNetworkConfig::copy_to_orig(void)
|
||||
{
|
||||
orig_automatic_start = automatic_start;
|
||||
@@ -108,6 +126,9 @@ int mysystem(char * cmd, char * arg1, char * arg2)
|
||||
void CNetworkConfig::startNetwork(void)
|
||||
{
|
||||
system("/sbin/ifup -v eth0");
|
||||
if (!inet_static) {
|
||||
init_vars();
|
||||
}
|
||||
//mysystem((char *) "ifup", (char *) "-v", (char *) "eth0");
|
||||
}
|
||||
|
||||
|
@@ -37,6 +37,7 @@ class CNetworkConfig
|
||||
|
||||
void copy_to_orig(void);
|
||||
bool modified_from_orig(void);
|
||||
void init_vars(void);
|
||||
|
||||
public:
|
||||
bool automatic_start;
|
||||
|
@@ -243,6 +243,7 @@ typedef enum {
|
||||
LOCALE_COLORMENU_BACKGROUND,
|
||||
LOCALE_COLORMENU_FADE,
|
||||
LOCALE_COLORMENU_FONT,
|
||||
LOCALE_COLORMENU_FONT_TTX,
|
||||
LOCALE_COLORMENU_GTX_ALPHA,
|
||||
LOCALE_COLORMENU_HEAD,
|
||||
LOCALE_COLORMENU_MENUCOLORS,
|
||||
|
@@ -243,6 +243,7 @@ const char *locale_real_names[] = {
|
||||
"colormenu.background",
|
||||
"colormenu.fade",
|
||||
"colormenu.font",
|
||||
"colormenu.font_ttx",
|
||||
"colormenu.gtx_alpha",
|
||||
"colormenu.head",
|
||||
"colormenu.menucolors",
|
||||
|
@@ -536,6 +536,10 @@ bool CIPChangeNotifier::changeNotify(const neutrino_locale_t, void * Data)
|
||||
|
||||
CNeutrinoApp::getInstance()->networkConfig.netmask = (_ip[0] == 10) ? "255.0.0.0" : "255.255.255.0";
|
||||
|
||||
sprintf(ip, "%hhu.%hhu.%hhu.1", _ip[0], _ip[1], _ip[2]);
|
||||
CNeutrinoApp::getInstance()->networkConfig.nameserver = ip;
|
||||
CNeutrinoApp::getInstance()->networkConfig.gateway = ip;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -611,8 +615,11 @@ printf("CSubtitleChangeExec::exec: action %s\n", actionKey.c_str());
|
||||
ptr = strchr(ptr, ':');
|
||||
ptr++;
|
||||
int page = strtol(ptr, NULL, 16);
|
||||
printf("CSubtitleChangeExec::exec: TTX, pid %x page %x\n", pid, page);
|
||||
ptr = strchr(ptr, ':');
|
||||
ptr++;
|
||||
printf("CSubtitleChangeExec::exec: TTX, pid %x page %x lang %s\n", pid, page, ptr);
|
||||
tuxtx_stop_subtitle();
|
||||
tuxtx_set_pid(pid, page, ptr);
|
||||
dvbsub_stop();
|
||||
tuxtx_main(g_RCInput->getFileHandle(), pid, page);
|
||||
}
|
||||
|
@@ -432,6 +432,7 @@ struct SNeutrinoSettings
|
||||
int zap_cycle;
|
||||
int sms_channel;
|
||||
char font_file[100];
|
||||
char ttx_font_file[100];
|
||||
char update_dir[100];
|
||||
// USERMENU
|
||||
typedef enum
|
||||
|
Reference in New Issue
Block a user