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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-01-23 14:08:37 +01:00
parent 4928640ab8 d6ae5d0453
commit b7c804fc22
92 changed files with 2474 additions and 1428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/system/settings.h
View File

@@ -243,7 +243,7 @@ struct SNeutrinoSettings
};
int personalize[P_SETTINGS_MAX];
char personalize_pincode[5];
std::string personalize_pincode;
//timing
enum TIMING_SETTINGS
@@ -497,10 +497,10 @@ struct SNeutrinoSettings
//Software-update
int softupdate_mode;
char softupdate_url_file[31];
char softupdate_proxyserver[31];
char softupdate_proxyusername[31];
char softupdate_proxypassword[31];
std::string softupdate_url_file;
std::string softupdate_proxyserver;
std::string softupdate_proxyusername;
std::string softupdate_proxypassword;
int softupdate_name_mode_apply;
int softupdate_name_mode_backup;
int apply_settings;
@@ -519,7 +519,7 @@ struct SNeutrinoSettings
int parentallock_prompt;
int parentallock_lockage;
int parentallock_defaultlocked;
char parentallock_pincode[5];
std::string parentallock_pincode;
// Font sizes
@@ -573,7 +573,7 @@ struct SNeutrinoSettings
};
int lcd_setting[LCD_SETTING_COUNT];
int lcd_info_line;
char lcd_setting_dim_time[4];
std::string lcd_setting_dim_time;
int lcd_setting_dim_brightness;
int led_tv_mode;
int led_standby_mode;
@@ -768,20 +768,20 @@ class CScanSettings
int fast_op;
int cable_nid;
char satName[50];
std::string satName;
int sat_TP_fec;
int sat_TP_pol;
char sat_TP_freq[10];
char sat_TP_rate[9];
std::string sat_TP_freq;
std::string sat_TP_rate;
char cableName[50];
std::string cableName;
int cable_TP_mod;
int cable_TP_fec;
char cable_TP_freq[10];
char cable_TP_rate[9];
std::string cable_TP_freq;
std::string cable_TP_rate;
char terrName[50];
char terr_TP_freq[10];
std::string terrName;
std::string terr_TP_freq;
CScanSettings();
//void useDefaults(const delivery_system_t _delivery_system);
@@ -789,5 +789,4 @@ class CScanSettings
bool saveSettings(const char * const fileName);
};
#endif