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

Merge branch 'uncool/dvbsi++' commit '9d968280bac'

Browse Source 
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-07-22 14:09:43 +02:00
parent 2da175a159 9d968280ba
commit 3df9a6f7f5
354 changed files with 17604 additions and 32020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/system/settings.h
View File

@@ -87,8 +87,11 @@ struct SNeutrinoSettings
int volume_pos;
int show_mute_icon;
int menu_pos;
int infobar_show_var_hdd;
int show_menu_hints;
int infobar_show_sysfs_hdd;
int infobar_show_res;
int infobar_show_tuner;
int infobar_show_dd_available;
//audio
int audio_AnalogMode;
int audio_DolbyDigital;
@@ -111,10 +114,14 @@ struct SNeutrinoSettings
int cpufreq;
int standby_cpufreq;
int make_hd_list;
int make_new_list;
int make_removed_list;
int keep_channel_numbers;
int avsync;
int clockrec;
int rounded_corners;
int ci_standby_reset;
int ci_clock;
int radiotext_enable;
//vcr
@@ -421,7 +428,7 @@ struct SNeutrinoSettings
int channellist_extended;
int channellist_foot;
int channellist_new_zap_mode;
int channellist_sort_mode;
char repeat_blocker[4];
char repeat_genericblocker[4];
int remote_control_hardware;
@@ -544,17 +551,13 @@ struct SNeutrinoSettings
std::string StartChannelRadio;
t_channel_id startchanneltv_id;
t_channel_id startchannelradio_id;
int startchanneltv_nr;
int startchannelradio_nr;
int uselastchannel;
int power_standby;
int emlog;
int rotor_swap;
int hdd_sleep;
int hdd_noise;
int hdd_fs;
int logo_num;
int zap_cycle;
int sms_channel;
char font_file[100];
@@ -678,13 +681,15 @@ public:
CConfigFile configfile;
int bouquetMode;
int scanType;
int diseqcMode;
uint32_t diseqcRepeat;
char satNameNoDiseqc[50];
delivery_system_t delivery_system;
int scanSectionsd;
int scan_mode;
int scan_nit;
int scan_nit_manual;
int scan_bat;
int scan_fta_flag;
int scan_reset_numbers;
int scan_logical_numbers;
int TP_fec;
int TP_pol;
int TP_mod;
@@ -692,10 +697,11 @@ public:
char TP_rate[9];
int fast_type;
int fast_op;
int cable_nid;
CScanSettings();
void useDefaults(const delivery_system_t _delivery_system);
//void useDefaults(const delivery_system_t _delivery_system);
bool loadSettings(const char * const fileName, const delivery_system_t _delivery_system);
bool saveSettings(const char * const fileName);
};