diff -urx po orig-cvs/apps/tuxbox/neutrino/data/locale/english.locale tuxbox-cvs/apps/tuxbox/neutrino/data/locale/english.locale
--- orig-cvs/apps/tuxbox/neutrino/data/locale/english.locale 2006-08-06 20:28:36.000000000 +0100
+++ tuxbox-cvs/apps/tuxbox/neutrino/data/locale/english.locale 2006-08-28 12:40:24.000000000 +0100
@@ -863,6 +863,7 @@
scantp.fec_5_6 5/6
scantp.fec_7_8 7/8
scantp.freq Frequency
+scantp.netid Network ID
scantp.pol Polarization
scantp.pol_h H
scantp.pol_v V
diff -urx po orig-cvs/apps/tuxbox/neutrino/src/neutrino.cpp tuxbox-cvs/apps/tuxbox/neutrino/src/neutrino.cpp
--- orig-cvs/apps/tuxbox/neutrino/src/neutrino.cpp 2006-08-28 16:49:03.000000000 +0100
+++ tuxbox-cvs/apps/tuxbox/neutrino/src/neutrino.cpp 2006-08-28 18:27:48.000000000 +0100
@@ -1709,21 +1709,22 @@
settings.addItem( ojBouquets );
settings.addItem( oj);
}
- CMenuOptionChooser* onoff_mode = ( new CMenuOptionChooser(LOCALE_SCANTP_SCANMODE, (int *)&scanSettings.scan_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
- settings.addItem(onoff_mode);
+
if(scanSettings.TP_fec == 0)
scanSettings.TP_fec = 1;
- settings.addItem(GenericMenuSeparatorLine);
+ CStringInput* freq = new CStringInput(LOCALE_SCANTP_FREQ, (char *) scanSettings.TP_freq, 6, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789 ");
+ CStringInput* rate = new CStringInput(LOCALE_SCANTP_RATE, (char *) scanSettings.TP_rate, 4, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789 ");
+ CStringInput* netid = new CStringInput(LOCALE_SCANTP_NETID, (char *) scanSettings.netid, 5, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789 ");
- CStringInput* freq = new CStringInput(LOCALE_SCANTP_FREQ, (char *) scanSettings.TP_freq, 8, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789 ");
- CStringInput* rate = new CStringInput(LOCALE_SCANTP_RATE, (char *) scanSettings.TP_rate, 8, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789 ");
+ scanSettings.TP_fec = 3;
+ scanSettings.TP_pol = 0;
- CMenuOptionChooser* fec = new CMenuOptionChooser(LOCALE_SCANTP_FEC, (int *)&scanSettings.TP_fec, SATSETUP_SCANTP_FEC, SATSETUP_SCANTP_FEC_COUNT, scanSettings.TP_scan);
- CMenuOptionChooser* pol = new CMenuOptionChooser(LOCALE_SCANTP_POL, (int *)&scanSettings.TP_pol, SATSETUP_SCANTP_POL, SATSETUP_SCANTP_POL_COUNT, scanSettings.TP_scan);
CMenuOptionChooser* onoffscanSectionsd = ( new CMenuOptionChooser(LOCALE_SECTIONSD_SCANMODE, (int *)&scanSettings.scanSectionsd, SECTIONSD_SCAN_OPTIONS, SECTIONSD_SCAN_OPTIONS_COUNT, true,new CScanModeSectionsdNotifier));
- CMenuForwarder *Rate =new CMenuForwarder(LOCALE_SCANTP_RATE, scanSettings.TP_scan, scanSettings.TP_rate, rate);
- CMenuForwarder *Freq = new CMenuForwarder(LOCALE_SCANTP_FREQ, scanSettings.TP_scan, scanSettings.TP_freq, freq);
+ CMenuForwarder *Rate =new CMenuForwarder(LOCALE_SCANTP_RATE, scanSettings.scan_mode, scanSettings.TP_rate, rate);
+ CMenuForwarder *Freq = new CMenuForwarder(LOCALE_SCANTP_FREQ, scanSettings.scan_mode, scanSettings.TP_freq, freq);
+ CMenuForwarder *Netid = new CMenuForwarder(LOCALE_SCANTP_NETID, scanSettings.scan_mode, scanSettings.netid, netid);
+ CTP_scanNotifier *TP_scanNotifier = new CTP_scanNotifier(Netid,Freq,Rate);
scanSettings.TP_SatSelectMenu = new CMenuOptionStringChooser(LOCALE_SATSETUP_SATELLITE, scanSettings.TP_satname, ((scanSettings.diseqcMode != NO_DISEQC) && scanSettings.TP_scan), new CScanSettingsSatManNotifier);
//sat-lnb-settings
@@ -1747,15 +1748,14 @@
}
}
- CTP_scanNotifier *TP_scanNotifier = new CTP_scanNotifier(fec,pol,Freq,Rate,scanSettings.TP_SatSelectMenu);
- CMenuOptionChooser* onoff = ( new CMenuOptionChooser(LOCALE_SCANTP_SCAN, (int *)&scanSettings.TP_scan, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, (g_info.delivery_system == DVB_S), TP_scanNotifier));
+ CMenuOptionChooser* onoff_mode = ( new CMenuOptionChooser(LOCALE_SCANTP_SCANMODE, (int *)&scanSettings.scan_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, TP_scanNotifier));
+ settings.addItem(onoff_mode);
+ settings.addItem(GenericMenuSeparatorLine);
- settings.addItem(onoff);
+ settings.addItem(Netid);
settings.addItem(Freq);
settings.addItem(Rate);
- settings.addItem(fec);
- settings.addItem(pol);
- settings.addItem(scanSettings.TP_SatSelectMenu);
+
settings.addItem(GenericMenuSeparatorLine);
settings.addItem(onoffscanSectionsd);
settings.addItem(GenericMenuSeparatorLine);
@@ -1791,13 +1791,15 @@
if(softupdate)
{
dprintf(DEBUG_DEBUG, "init soft-update-stuff\n");
- CMenuWidget* updateSettings = new CMenuWidget(LOCALE_SERVICEMENU_UPDATE, "softupdate.raw", 550);
+// CMenuWidget* updateSettings = new CMenuWidget(LOCALE_SERVICEMENU_UPDATE, "softupdate.raw", 550);
+ CMenuWidget* updateSettings = new CMenuWidget(LOCALE_SERVICEMENU_UPDATE, "softupdate.raw");
+
updateSettings->addItem(GenericMenuSeparator);
updateSettings->addItem(GenericMenuBack);
updateSettings->addItem(GenericMenuSeparatorLine);
+ CFlashExpert* fe = new CFlashExpert();
-
- // experts-functions to read/write to the mtd
+/* // experts-functions to read/write to the mtd
CMenuWidget* mtdexpert = new CMenuWidget(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, "softupdate.raw");
mtdexpert->addItem(GenericMenuSeparator);
mtdexpert->addItem(GenericMenuBack);
@@ -1813,46 +1815,50 @@
CStringInputSMS * updateSettings_url_file = new CStringInputSMS(LOCALE_FLASHUPDATE_URL_FILE, g_settings.softupdate_url_file, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789!""$%&/()=?-. ");
mtdexpert->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_URL_FILE, true, g_settings.softupdate_url_file, updateSettings_url_file));
- updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, true, NULL, mtdexpert, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
+ updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, true, NULL, mtdexpert, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); */
+ updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_READFLASHMTD , true, NULL, fe, "readflashmtd" , CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
+ updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_WRITEFLASHMTD, true, NULL, fe, "writeflashmtd" , CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
updateSettings->addItem(GenericMenuSeparatorLine);
- CMenuOptionChooser *oj = new CMenuOptionChooser(LOCALE_FLASHUPDATE_UPDATEMODE, &g_settings.softupdate_mode, FLASHUPDATE_UPDATEMODE_OPTIONS, FLASHUPDATE_UPDATEMODE_OPTION_COUNT, true);
- updateSettings->addItem( oj );
+// CMenuOptionChooser *oj = new CMenuOptionChooser(LOCALE_FLASHUPDATE_UPDATEMODE, &g_settings.softupdate_mode, FLASHUPDATE_UPDATEMODE_OPTIONS, FLASHUPDATE_UPDATEMODE_OPTION_COUNT, true);
+// updateSettings->addItem( oj );
/* show current version */
- updateSettings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_FLASHUPDATE_CURRENTVERSION_SEP));
+// updateSettings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_FLASHUPDATE_CURRENTVERSION_SEP));
/* get current version SBBBYYYYMMTTHHMM -- formatsting */
- CConfigFile configfile('\t');
-
- const char * versionString = (configfile.loadConfig("/.version")) ? (configfile.getString( "version", "????????????????").c_str()) : "????????????????";
+// CConfigFile configfile('\t');
- dprintf(DEBUG_INFO, "current flash-version: %s\n", versionString);
+// const char * versionString = (configfile.loadConfig("/.version")) ? (configfile.getString( "version", "????????????????").c_str()) : "????????????????";
- static CFlashVersionInfo versionInfo(versionString);
-
- updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CURRENTVERSIONDATE , false, versionInfo.getDate()));
- updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CURRENTVERSIONTIME , false, versionInfo.getTime()));
- updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CURRENTRELEASECYCLE , false, versionInfo.getReleaseCycle()));
+// dprintf(DEBUG_INFO, "current flash-version: %s\n", versionString);
+ CStringInputSMS * updateSettings_url_file = new CStringInputSMS(LOCALE_FLASHUPDATE_URL_FILE, g_settings.softupdate_url_file, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789!""$%&/()=?-. ");
+ updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_URL_FILE, true, g_settings.softupdate_url_file, updateSettings_url_file));
+// static CFlashVersionInfo versionInfo(versionString);
+
+// updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CURRENTVERSIONDATE , false, versionInfo.getDate()));
+// updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CURRENTVERSIONTIME , false, versionInfo.getTime()));
+// updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CURRENTRELEASECYCLE , false, versionInfo.getReleaseCycle()));
/* versionInfo.getType() returns const char * which is never deallocated */
- updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CURRENTVERSIONSNAPSHOT, false, versionInfo.getType()));
+// updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CURRENTVERSIONSNAPSHOT, false, versionInfo.getType()));
- updateSettings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_FLASHUPDATE_PROXYSERVER_SEP));
+// updateSettings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_FLASHUPDATE_PROXYSERVER_SEP));
- CStringInputSMS * updateSettings_proxy = new CStringInputSMS(LOCALE_FLASHUPDATE_PROXYSERVER, g_settings.softupdate_proxyserver, 23, LOCALE_FLASHUPDATE_PROXYSERVER_HINT1, LOCALE_FLASHUPDATE_PROXYSERVER_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789-.: ");
- updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYSERVER, true, g_settings.softupdate_proxyserver, updateSettings_proxy));
+// CStringInputSMS * updateSettings_proxy = new CStringInputSMS(LOCALE_FLASHUPDATE_PROXYSERVER, g_settings.softupdate_proxyserver, 23, LOCALE_FLASHUPDATE_PROXYSERVER_HINT1, LOCALE_FLASHUPDATE_PROXYSERVER_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789-.: ");
+// updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYSERVER, true, g_settings.softupdate_proxyserver, updateSettings_proxy));
- CStringInputSMS * updateSettings_proxyuser = new CStringInputSMS(LOCALE_FLASHUPDATE_PROXYUSERNAME, g_settings.softupdate_proxyusername, 23, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT1, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789!""§$%&/()=?-. ");
- updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYUSERNAME, true, g_settings.softupdate_proxyusername, updateSettings_proxyuser));
+// CStringInputSMS * updateSettings_proxyuser = new CStringInputSMS(LOCALE_FLASHUPDATE_PROXYUSERNAME, g_settings.softupdate_proxyusername, 23, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT1, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789!""§$%&/()=?-. ");
+// updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYUSERNAME, true, g_settings.softupdate_proxyusername, updateSettings_proxyuser));
- CStringInputSMS * updateSettings_proxypass = new CStringInputSMS(LOCALE_FLASHUPDATE_PROXYPASSWORD, g_settings.softupdate_proxypassword, 20, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT1, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789!""§$%&/()=?-. ");
- updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYPASSWORD, true, g_settings.softupdate_proxypassword, updateSettings_proxypass));
+// CStringInputSMS * updateSettings_proxypass = new CStringInputSMS(LOCALE_FLASHUPDATE_PROXYPASSWORD, g_settings.softupdate_proxypassword, 20, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT1, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789!""§$%&/()=?-. ");
+// updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYPASSWORD, true, g_settings.softupdate_proxypassword, updateSettings_proxypass));
- updateSettings->addItem(GenericMenuSeparatorLine);
- updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE, true, NULL, new CFlashUpdate(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
+// updateSettings->addItem(GenericMenuSeparatorLine);
+// updateSettings->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE, true, NULL, new CFlashUpdate(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
- service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, updateSettings, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
+// service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, updateSettings, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
+ service.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, updateSettings, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
}
}
@@ -3343,7 +3349,7 @@
CLocaleManager::loadLocale_ret_t loadLocale_ret = g_Locale->loadLocale(g_settings.language);
if (loadLocale_ret == CLocaleManager::NO_SUCH_LOCALE)
{
- strcpy(g_settings.language, "deutsch");
+ strcpy(g_settings.language, "english");
loadLocale_ret = g_Locale->loadLocale(g_settings.language);
display_language_selection = true;
}
Binary files orig-cvs/apps/tuxbox/neutrino/src/neutrino.o and tuxbox-cvs/apps/tuxbox/neutrino/src/neutrino.o differ
Binary files orig-cvs/apps/tuxbox/neutrino/src/system/libneutrino_system.a and tuxbox-cvs/apps/tuxbox/neutrino/src/system/libneutrino_system.a differ
Binary files orig-cvs/apps/tuxbox/neutrino/src/system/localize.o and tuxbox-cvs/apps/tuxbox/neutrino/src/system/localize.o differ
diff -urx po orig-cvs/apps/tuxbox/neutrino/src/system/locals.h tuxbox-cvs/apps/tuxbox/neutrino/src/system/locals.h
--- orig-cvs/apps/tuxbox/neutrino/src/system/locals.h 2006-08-06 20:28:36.000000000 +0100
+++ tuxbox-cvs/apps/tuxbox/neutrino/src/system/locals.h 2006-08-28 12:49:12.000000000 +0100
@@ -890,6 +890,7 @@
LOCALE_SCANTP_FEC_5_6,
LOCALE_SCANTP_FEC_7_8,
LOCALE_SCANTP_FREQ,
+ LOCALE_SCANTP_NETID,
LOCALE_SCANTP_POL,
LOCALE_SCANTP_POL_H,
LOCALE_SCANTP_POL_V,
diff -urx po orig-cvs/apps/tuxbox/neutrino/src/system/locals_intern.h tuxbox-cvs/apps/tuxbox/neutrino/src/system/locals_intern.h
--- orig-cvs/apps/tuxbox/neutrino/src/system/locals_intern.h 2006-08-06 20:28:36.000000000 +0100
+++ tuxbox-cvs/apps/tuxbox/neutrino/src/system/locals_intern.h 2006-08-28 12:49:59.000000000 +0100
@@ -890,6 +890,7 @@
"scantp.fec_5_6",
"scantp.fec_7_8",
"scantp.freq",
+ "scantp.netid",
"scantp.pol",
"scantp.pol_h",
"scantp.pol_v",
diff -urx po orig-cvs/apps/tuxbox/neutrino/src/system/setting_helpers.cpp tuxbox-cvs/apps/tuxbox/neutrino/src/system/setting_helpers.cpp
--- orig-cvs/apps/tuxbox/neutrino/src/system/setting_helpers.cpp 2006-08-19 20:55:38.000000000 +0100
+++ tuxbox-cvs/apps/tuxbox/neutrino/src/system/setting_helpers.cpp 2006-08-28 12:56:56.000000000 +0100
@@ -91,24 +91,21 @@
return true;
}
-CTP_scanNotifier::CTP_scanNotifier(CMenuOptionChooser* i1, CMenuOptionChooser* i2, CMenuForwarder* i3, CMenuForwarder* i4, CMenuOptionStringChooser* i5)
+CTP_scanNotifier::CTP_scanNotifier(CMenuForwarder* i1, CMenuForwarder* i2, CMenuForwarder* i3)
{
- toDisable1[0]=i1;
- toDisable1[1]=i2;
- toDisable2[0]=i3;
- toDisable2[1]=i4;
- toDisable3[0]=i5;
+ toDisable[0]=i1;
+ toDisable[1]=i2;
+ toDisable[2]=i3;
}
bool CTP_scanNotifier::changeNotify(const neutrino_locale_t, void *)
{
- bool set_true_false=CNeutrinoApp::getInstance()->getScanSettings().TP_scan;
- for (int i=0; i<2; i++)
+ bool set_true_false=CNeutrinoApp::getInstance()->getScanSettings().scan_mode;
+ for (int i=0; i<3; i++)
{
- toDisable1->setActive(set_true_false);
- toDisable2->setActive(set_true_false);
+ toDisable->setActive(set_true_false);
}
- toDisable3[0]->setActive(set_true_false);
+// toDisable3[0]->setActive(set_true_false);
return true;
}
diff -urx po orig-cvs/apps/tuxbox/neutrino/src/system/setting_helpers.h tuxbox-cvs/apps/tuxbox/neutrino/src/system/setting_helpers.h
--- orig-cvs/apps/tuxbox/neutrino/src/system/setting_helpers.h 2006-06-08 21:19:46.000000000 +0100
+++ tuxbox-cvs/apps/tuxbox/neutrino/src/system/setting_helpers.h 2006-08-28 12:59:46.000000000 +0100
@@ -57,12 +57,10 @@
class CTP_scanNotifier : public CChangeObserver
{
private:
- CMenuOptionChooser* toDisable1[3];
- CMenuForwarder* toDisable2[2];
- CMenuOptionStringChooser* toDisable3[1];
+ CMenuForwarder* toDisable[3];
public:
- CTP_scanNotifier(CMenuOptionChooser*, CMenuOptionChooser*, CMenuForwarder*, CMenuForwarder*, CMenuOptionStringChooser*);
+ CTP_scanNotifier(CMenuForwarder*, CMenuForwarder*, CMenuForwarder*);
bool changeNotify(const neutrino_locale_t, void *);
};
diff -urx po orig-cvs/apps/tuxbox/neutrino/src/system/settings.cpp tuxbox-cvs/apps/tuxbox/neutrino/src/system/settings.cpp
--- orig-cvs/apps/tuxbox/neutrino/src/system/settings.cpp 2006-06-08 21:19:46.000000000 +0100
+++ tuxbox-cvs/apps/tuxbox/neutrino/src/system/settings.cpp 2006-08-28 13:01:49.000000000 +0100
@@ -261,6 +261,7 @@
TP_pol = configfile.getInt32("TP_pol", 0);
strcpy(TP_freq, configfile.getString("TP_freq", "10100000").c_str());
strcpy(TP_rate, configfile.getString("TP_rate", "27500000").c_str());
+ strcpy(netid, configfile.getString("netid", "40975").c_str());
strncpy(TP_satname, configfile.getString("TP_satname", "Astra 19.2E").c_str(), 30);
TP_diseqc = *diseqscOfSat(TP_satname);
#if HAVE_DVB_API_VERSION >= 3
@@ -313,6 +314,7 @@
configfile.setInt32("TP_pol", TP_pol);
configfile.setString("TP_freq", TP_freq);
configfile.setString("TP_rate", TP_rate);
+ configfile.setString("netid", netid);
configfile.setString("TP_satname", TP_satname);
configfile.setInt32("scanSectionsd",scanSectionsd );
diff -urx po orig-cvs/apps/tuxbox/neutrino/src/system/settings.h tuxbox-cvs/apps/tuxbox/neutrino/src/system/settings.h
--- orig-cvs/apps/tuxbox/neutrino/src/system/settings.h 2006-08-06 20:52:40.000000000 +0100
+++ tuxbox-cvs/apps/tuxbox/neutrino/src/system/settings.h 2006-08-28 13:03:00.000000000 +0100
@@ -411,6 +411,7 @@
int TP_pol;
char TP_freq[9];
char TP_rate[9];
+ char netid[6];
char TP_satname[30];
int TP_diseqc;
CMenuOptionStringChooser* TP_SatSelectMenu;
