mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes
Conflicts:
configure.ac
data/icons/shutdown.jpg
data/icons/start.jpg
data/locale/deutsch.locale
data/locale/english.locale
lib/libmd5sum/md5.c
src/driver/scanepg.cpp
src/driver/streamts.cpp
src/driver/vfd.cpp
src/driver/vfd.h
src/driver/volume.cpp
src/eitd/dmx.cpp
src/eitd/xmlutil.cpp
src/gui/Makefile.am
src/gui/audiomute.cpp
src/gui/channellist.cpp
src/gui/dboxinfo.cpp
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/filebrowser.cpp
src/gui/hdd_menu.cpp
src/gui/infoviewer.cpp
src/gui/infoviewer_bb.cpp
src/gui/infoviewer_bb.h
src/gui/keybind_setup.cpp
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/miscsettings_menu.cpp
src/gui/moviebrowser.cpp
src/gui/movieplayer.cpp
src/gui/osd_progressbar_setup.cpp
src/gui/osd_progressbar_setup.h
src/gui/osd_setup.cpp
src/gui/osdlang_setup.cpp
src/gui/personalize.cpp
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/update_settings.cpp
src/gui/user_menue.cpp
src/gui/user_menue_setup.cpp
src/gui/videosettings.cpp
src/gui/widget/buttons.cpp
src/gui/widget/menue.cpp
src/gui/widget/menue.h
src/gui/widget/progresswindow.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/nhttpd/yhttpd.cpp
src/system/helpers.cpp
src/system/locals.h
src/system/locals_intern.h
src/system/setting_helpers.cpp
src/zapit/lib/zapitclient.cpp
src/zapit/src/fastscan.cpp
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/scan.cpp
src/zapit/src/scannit.cpp
src/zapit/src/scanpmt.cpp
src/zapit/src/transponder.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
@@ -52,240 +52,8 @@
|
||||
#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 13
|
||||
#endif
|
||||
|
||||
struct SNeutrinoSettings
|
||||
struct SNeutrinoTheme
|
||||
{
|
||||
//video
|
||||
int video_Format;
|
||||
int video_Mode;
|
||||
int analog_mode1;
|
||||
int analog_mode2;
|
||||
int video_43mode;
|
||||
#ifdef BOXMODEL_APOLLO
|
||||
int brightness;
|
||||
int contrast;
|
||||
int saturation;
|
||||
int enable_sd_osd;
|
||||
#endif
|
||||
char current_volume;
|
||||
int current_volume_step;
|
||||
int channel_mode;
|
||||
int channel_mode_radio;
|
||||
int channel_mode_initial;
|
||||
int channel_mode_initial_radio;
|
||||
|
||||
//misc
|
||||
int shutdown_real;
|
||||
int shutdown_real_rcdelay;
|
||||
int shutdown_count;
|
||||
int shutdown_min;
|
||||
int sleeptimer_min;
|
||||
int record_safety_time_before;
|
||||
int record_safety_time_after;
|
||||
int zapto_pre_time;
|
||||
int infobar_sat_display;
|
||||
int infobar_show_channeldesc;
|
||||
int infobar_subchan_disp_pos;
|
||||
int fan_speed;
|
||||
int infobar_show;
|
||||
int infobar_show_channellogo;
|
||||
int infobar_progressbar;
|
||||
int progressbar_color;
|
||||
int progressbar_design;
|
||||
int casystem_display;
|
||||
int scrambled_message;
|
||||
int volume_pos;
|
||||
int volume_digits;
|
||||
int volume_size;
|
||||
int show_mute_icon;
|
||||
int menu_pos;
|
||||
int show_menu_hints;
|
||||
int infobar_show_sysfs_hdd;
|
||||
int infobar_show_res;
|
||||
int infobar_show_tuner;
|
||||
int infobar_show_dd_available;
|
||||
int wzap_time;
|
||||
//audio
|
||||
int audio_AnalogMode;
|
||||
int audio_DolbyDigital;
|
||||
int auto_lang;
|
||||
int auto_subs;
|
||||
int srs_enable;
|
||||
int srs_algo;
|
||||
int srs_ref_volume;
|
||||
int srs_nmgr_enable;
|
||||
int hdmi_dd;
|
||||
int spdif_dd;
|
||||
int analog_out;
|
||||
//video
|
||||
int video_dbdr;
|
||||
int hdmi_cec_mode;
|
||||
int hdmi_cec_view_on;
|
||||
int hdmi_cec_standby;
|
||||
int enabled_video_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];
|
||||
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 ci_ignore_messages;
|
||||
int radiotext_enable;
|
||||
int easymenu;
|
||||
|
||||
//vcr
|
||||
int vcr_AutoSwitch;
|
||||
|
||||
//language
|
||||
std::string language;
|
||||
std::string timezone;
|
||||
|
||||
std::string pref_lang[3];
|
||||
std::string pref_subs[3];
|
||||
std::string subs_charset;
|
||||
|
||||
// EPG
|
||||
int epg_save;
|
||||
int epg_save_standby;
|
||||
int epg_cache;
|
||||
int epg_old_events;
|
||||
int epg_max_events;
|
||||
int epg_extendedcache;
|
||||
std::string epg_dir;
|
||||
int epg_scan;
|
||||
int epg_scan_mode;
|
||||
|
||||
int epg_search_history_size;
|
||||
int epg_search_history_max;
|
||||
std::list<std::string> epg_search_history;
|
||||
|
||||
//network
|
||||
std::string network_ntpserver;
|
||||
std::string network_ntprefresh;
|
||||
int network_ntpenable;
|
||||
std::string ifname;
|
||||
|
||||
//personalize
|
||||
enum PERSONALIZE_SETTINGS //settings.h
|
||||
{
|
||||
P_MAIN_PINSTATUS,
|
||||
|
||||
//user menu
|
||||
P_MAIN_BLUE_BUTTON,
|
||||
P_MAIN_YELLOW_BUTTON,
|
||||
P_MAIN_GREEN_BUTTON,
|
||||
P_MAIN_RED_BUTTON,
|
||||
|
||||
//main menu
|
||||
P_MAIN_TV_MODE,
|
||||
P_MAIN_TV_RADIO_MODE, //togglemode
|
||||
P_MAIN_RADIO_MODE,
|
||||
P_MAIN_TIMER,
|
||||
P_MAIN_MEDIA,
|
||||
|
||||
P_MAIN_GAMES,
|
||||
P_MAIN_TOOLS,
|
||||
P_MAIN_SCRIPTS,
|
||||
P_MAIN_LUA,
|
||||
P_MAIN_SETTINGS,
|
||||
P_MAIN_SERVICE,
|
||||
P_MAIN_SLEEPTIMER,
|
||||
P_MAIN_REBOOT,
|
||||
P_MAIN_SHUTDOWN,
|
||||
P_MAIN_INFOMENU,
|
||||
P_MAIN_CISETTINGS,
|
||||
|
||||
//settings menu
|
||||
P_MSET_SETTINGS_MANAGER,
|
||||
P_MSET_VIDEO,
|
||||
P_MSET_AUDIO,
|
||||
P_MSET_NETWORK,
|
||||
P_MSET_RECORDING,
|
||||
P_MSET_OSDLANG,
|
||||
P_MSET_OSD,
|
||||
P_MSET_VFD,
|
||||
P_MSET_DRIVES,
|
||||
P_MSET_CISETTINGS,
|
||||
P_MSET_KEYBINDING,
|
||||
P_MSET_MEDIAPLAYER,
|
||||
P_MSET_MISC,
|
||||
|
||||
//service menu
|
||||
P_MSER_TUNER,
|
||||
P_MSER_SCANTS,
|
||||
P_MSER_RELOAD_CHANNELS,
|
||||
P_MSER_BOUQUET_EDIT,
|
||||
P_MSER_RESET_CHANNELS,
|
||||
P_MSER_RESTART,
|
||||
P_MSER_RELOAD_PLUGINS,
|
||||
P_MSER_SERVICE_INFOMENU,
|
||||
P_MSER_SOFTUPDATE,
|
||||
|
||||
//media menu
|
||||
P_MEDIA_MENU,
|
||||
P_MEDIA_AUDIO,
|
||||
P_MEDIA_INETPLAY,
|
||||
P_MEDIA_MPLAYER,
|
||||
P_MEDIA_PVIEWER,
|
||||
P_MEDIA_UPNP,
|
||||
|
||||
//movieplayer menu
|
||||
P_MPLAYER_MBROWSER,
|
||||
P_MPLAYER_FILEPLAY,
|
||||
P_MPLAYER_YTPLAY,
|
||||
|
||||
//feature keys
|
||||
P_FEAT_KEY_FAVORIT,
|
||||
P_FEAT_KEY_TIMERLIST,
|
||||
P_FEAT_KEY_VTXT,
|
||||
P_FEAT_KEY_RC_LOCK,
|
||||
|
||||
//user menu
|
||||
P_UMENU_SHOW_CANCEL,
|
||||
|
||||
//plugins types
|
||||
P_UMENU_PLUGIN_TYPE_GAMES,
|
||||
P_UMENU_PLUGIN_TYPE_TOOLS,
|
||||
P_UMENU_PLUGIN_TYPE_SCRIPTS,
|
||||
P_UMENU_PLUGIN_TYPE_LUA,
|
||||
|
||||
P_SETTINGS_MAX
|
||||
};
|
||||
|
||||
int personalize[P_SETTINGS_MAX];
|
||||
std::string personalize_pincode;
|
||||
|
||||
//timing
|
||||
enum TIMING_SETTINGS
|
||||
{
|
||||
TIMING_MENU = 0,
|
||||
TIMING_CHANLIST = 1,
|
||||
TIMING_EPG = 2,
|
||||
TIMING_INFOBAR = 3,
|
||||
TIMING_INFOBAR_RADIO = 4,
|
||||
TIMING_INFOBAR_MOVIE = 5,
|
||||
TIMING_VOLUMEBAR = 6,
|
||||
TIMING_FILEBROWSER = 7,
|
||||
TIMING_NUMERICZAP = 8,
|
||||
|
||||
TIMING_SETTING_COUNT
|
||||
};
|
||||
|
||||
int timing [TIMING_SETTING_COUNT];
|
||||
|
||||
//widget settings
|
||||
int widget_fade;
|
||||
|
||||
//colors
|
||||
unsigned char clock_Digit_alpha;
|
||||
unsigned char clock_Digit_red;
|
||||
unsigned char clock_Digit_green;
|
||||
unsigned char clock_Digit_blue;
|
||||
|
||||
unsigned char menu_Head_alpha;
|
||||
unsigned char menu_Head_red;
|
||||
unsigned char menu_Head_green;
|
||||
@@ -340,9 +108,256 @@ struct SNeutrinoSettings
|
||||
unsigned char colored_events_red;
|
||||
unsigned char colored_events_green;
|
||||
unsigned char colored_events_blue;
|
||||
|
||||
unsigned char clock_Digit_alpha;
|
||||
unsigned char clock_Digit_red;
|
||||
unsigned char clock_Digit_green;
|
||||
unsigned char clock_Digit_blue;
|
||||
};
|
||||
|
||||
struct SNeutrinoSettings
|
||||
{
|
||||
//video
|
||||
int video_Format;
|
||||
int video_Mode;
|
||||
int analog_mode1;
|
||||
int analog_mode2;
|
||||
int video_43mode;
|
||||
#ifdef BOXMODEL_APOLLO
|
||||
int brightness;
|
||||
int contrast;
|
||||
int saturation;
|
||||
int enable_sd_osd;
|
||||
#endif
|
||||
char current_volume;
|
||||
int current_volume_step;
|
||||
int start_volume;
|
||||
int channel_mode;
|
||||
int channel_mode_radio;
|
||||
int channel_mode_initial;
|
||||
int channel_mode_initial_radio;
|
||||
|
||||
//misc
|
||||
int shutdown_real;
|
||||
int shutdown_real_rcdelay;
|
||||
int shutdown_count;
|
||||
int shutdown_min;
|
||||
int sleeptimer_min;
|
||||
int record_safety_time_before;
|
||||
int record_safety_time_after;
|
||||
int zapto_pre_time;
|
||||
int infobar_sat_display;
|
||||
int infobar_show_channeldesc;
|
||||
int infobar_subchan_disp_pos;
|
||||
int fan_speed;
|
||||
int infobar_show;
|
||||
int infobar_show_channellogo;
|
||||
int infobar_progressbar;
|
||||
int progressbar_design;
|
||||
int progressbar_gradient;
|
||||
int progressbar_timescale_red;
|
||||
int progressbar_timescale_green;
|
||||
int progressbar_timescale_yellow;
|
||||
int progressbar_timescale_invert;
|
||||
int casystem_display;
|
||||
int scrambled_message;
|
||||
int volume_pos;
|
||||
int volume_digits;
|
||||
int volume_size;
|
||||
int show_mute_icon;
|
||||
int menu_pos;
|
||||
int show_menu_hints;
|
||||
int infobar_show_sysfs_hdd;
|
||||
int infobar_show_res;
|
||||
int infobar_show_tuner;
|
||||
int infobar_show_dd_available;
|
||||
int wzap_time;
|
||||
//audio
|
||||
int audio_AnalogMode;
|
||||
int audio_DolbyDigital;
|
||||
int auto_lang;
|
||||
int auto_subs;
|
||||
int srs_enable;
|
||||
int srs_algo;
|
||||
int srs_ref_volume;
|
||||
int srs_nmgr_enable;
|
||||
int hdmi_dd;
|
||||
int spdif_dd;
|
||||
int analog_out;
|
||||
//video
|
||||
int video_dbdr;
|
||||
int hdmi_cec_mode;
|
||||
int hdmi_cec_view_on;
|
||||
int hdmi_cec_standby;
|
||||
int enabled_video_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];
|
||||
int cpufreq;
|
||||
int standby_cpufreq;
|
||||
int make_hd_list;
|
||||
int make_webtv_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 ci_ignore_messages;
|
||||
int radiotext_enable;
|
||||
int easymenu;
|
||||
|
||||
//vcr
|
||||
int vcr_AutoSwitch;
|
||||
|
||||
//language
|
||||
std::string language;
|
||||
std::string timezone;
|
||||
|
||||
std::string pref_lang[3];
|
||||
std::string pref_subs[3];
|
||||
std::string subs_charset;
|
||||
|
||||
// EPG
|
||||
int epg_save;
|
||||
int epg_save_standby;
|
||||
int epg_cache;
|
||||
int epg_old_events;
|
||||
int epg_max_events;
|
||||
int epg_extendedcache;
|
||||
std::string epg_dir;
|
||||
int epg_scan;
|
||||
int epg_scan_mode;
|
||||
|
||||
int epg_search_history_size;
|
||||
int epg_search_history_max;
|
||||
std::list<std::string> epg_search_history;
|
||||
|
||||
//network
|
||||
std::string network_ntpserver;
|
||||
std::string network_ntprefresh;
|
||||
int network_ntpenable;
|
||||
std::string ifname;
|
||||
|
||||
std::list<std::string> webtv_xml;
|
||||
|
||||
//personalize
|
||||
enum PERSONALIZE_SETTINGS //settings.h
|
||||
{
|
||||
P_MAIN_PINSTATUS,
|
||||
|
||||
//user menu
|
||||
P_MAIN_BLUE_BUTTON,
|
||||
P_MAIN_YELLOW_BUTTON,
|
||||
P_MAIN_GREEN_BUTTON,
|
||||
P_MAIN_RED_BUTTON,
|
||||
|
||||
//main menu
|
||||
P_MAIN_TV_MODE,
|
||||
P_MAIN_TV_RADIO_MODE, //togglemode
|
||||
P_MAIN_RADIO_MODE,
|
||||
P_MAIN_TIMER,
|
||||
P_MAIN_MEDIA,
|
||||
|
||||
P_MAIN_GAMES,
|
||||
P_MAIN_TOOLS,
|
||||
P_MAIN_SCRIPTS,
|
||||
P_MAIN_LUA,
|
||||
P_MAIN_SETTINGS,
|
||||
P_MAIN_SERVICE,
|
||||
P_MAIN_SLEEPTIMER,
|
||||
P_MAIN_STANDBY,
|
||||
P_MAIN_REBOOT,
|
||||
P_MAIN_SHUTDOWN,
|
||||
P_MAIN_INFOMENU,
|
||||
P_MAIN_CISETTINGS,
|
||||
|
||||
//settings menu
|
||||
P_MSET_SETTINGS_MANAGER,
|
||||
P_MSET_VIDEO,
|
||||
P_MSET_AUDIO,
|
||||
P_MSET_NETWORK,
|
||||
P_MSET_RECORDING,
|
||||
P_MSET_OSDLANG,
|
||||
P_MSET_OSD,
|
||||
P_MSET_VFD,
|
||||
P_MSET_DRIVES,
|
||||
P_MSET_CISETTINGS,
|
||||
P_MSET_KEYBINDING,
|
||||
P_MSET_MEDIAPLAYER,
|
||||
P_MSET_MISC,
|
||||
|
||||
//service menu
|
||||
P_MSER_TUNER,
|
||||
P_MSER_SCANTS,
|
||||
P_MSER_RELOAD_CHANNELS,
|
||||
P_MSER_BOUQUET_EDIT,
|
||||
P_MSER_RESET_CHANNELS,
|
||||
P_MSER_RESTART,
|
||||
P_MSER_RELOAD_PLUGINS,
|
||||
P_MSER_SERVICE_INFOMENU,
|
||||
P_MSER_SOFTUPDATE,
|
||||
|
||||
//media menu
|
||||
P_MEDIA_MENU,
|
||||
P_MEDIA_AUDIO,
|
||||
P_MEDIA_INETPLAY,
|
||||
P_MEDIA_MPLAYER,
|
||||
P_MEDIA_PVIEWER,
|
||||
P_MEDIA_UPNP,
|
||||
|
||||
//movieplayer menu
|
||||
P_MPLAYER_MBROWSER,
|
||||
P_MPLAYER_FILEPLAY,
|
||||
P_MPLAYER_YTPLAY,
|
||||
|
||||
//feature keys
|
||||
P_FEAT_KEY_FAVORIT,
|
||||
P_FEAT_KEY_TIMERLIST,
|
||||
P_FEAT_KEY_VTXT,
|
||||
P_FEAT_KEY_RC_LOCK,
|
||||
|
||||
//user menu
|
||||
P_UMENU_SHOW_CANCEL,
|
||||
|
||||
//plugins types
|
||||
P_UMENU_PLUGIN_TYPE_GAMES,
|
||||
P_UMENU_PLUGIN_TYPE_TOOLS,
|
||||
P_UMENU_PLUGIN_TYPE_SCRIPTS,
|
||||
P_UMENU_PLUGIN_TYPE_LUA,
|
||||
|
||||
P_SETTINGS_MAX
|
||||
};
|
||||
|
||||
int personalize[P_SETTINGS_MAX];
|
||||
std::string personalize_pincode;
|
||||
|
||||
//timing
|
||||
enum TIMING_SETTINGS
|
||||
{
|
||||
TIMING_MENU = 0,
|
||||
TIMING_CHANLIST = 1,
|
||||
TIMING_EPG = 2,
|
||||
TIMING_INFOBAR = 3,
|
||||
TIMING_INFOBAR_RADIO = 4,
|
||||
TIMING_INFOBAR_MOVIE = 5,
|
||||
TIMING_VOLUMEBAR = 6,
|
||||
TIMING_FILEBROWSER = 7,
|
||||
TIMING_NUMERICZAP = 8,
|
||||
|
||||
TIMING_SETTING_COUNT
|
||||
};
|
||||
|
||||
int timing [TIMING_SETTING_COUNT];
|
||||
|
||||
//widget settings
|
||||
int widget_fade;
|
||||
|
||||
SNeutrinoTheme theme;
|
||||
|
||||
int colored_events_channellist;
|
||||
int colored_events_infobar;
|
||||
int contrast_fonts;
|
||||
int gradiant;
|
||||
|
||||
//network
|
||||
#define NETWORK_NFS_NR_OF_ENTRIES 8
|
||||
@@ -388,16 +403,22 @@ struct SNeutrinoSettings
|
||||
int filesystem_is_utf8;
|
||||
// default plugin for ts-movieplayer (red button)
|
||||
std::string movieplayer_plugin;
|
||||
std::string onekey_plugin;
|
||||
std::string plugin_hdd_dir;
|
||||
|
||||
|
||||
std::string logo_hdd_dir;
|
||||
|
||||
std::string plugins_disabled;
|
||||
std::string plugins_game;
|
||||
std::string plugins_tool;
|
||||
std::string plugins_script;
|
||||
std::string plugins_lua;
|
||||
|
||||
//key configuration
|
||||
int key_tvradio_mode;
|
||||
|
||||
int key_channelList_pageup;
|
||||
int key_channelList_pagedown;
|
||||
int key_pageup;
|
||||
int key_pagedown;
|
||||
|
||||
int key_channelList_cancel;
|
||||
int key_channelList_sort;
|
||||
int key_channelList_addrecord;
|
||||
@@ -415,7 +436,6 @@ struct SNeutrinoSettings
|
||||
int key_list_end;
|
||||
int key_power_off;
|
||||
int menu_left_exit;
|
||||
int audio_run_player;
|
||||
int key_click;
|
||||
int timeshift_pause;
|
||||
int auto_timeshift;
|
||||
@@ -423,6 +443,12 @@ struct SNeutrinoSettings
|
||||
int auto_delete;
|
||||
int record_hours;
|
||||
int timeshift_hours;
|
||||
int key_record;
|
||||
int key_help;
|
||||
int key_next43mode;
|
||||
int key_switchformat;
|
||||
int key_volumeup;
|
||||
int key_volumedown;
|
||||
|
||||
int mpkey_rewind;
|
||||
int mpkey_forward;
|
||||
@@ -433,7 +459,9 @@ struct SNeutrinoSettings
|
||||
int mpkey_time;
|
||||
int mpkey_bookmark;
|
||||
int mpkey_plugin;
|
||||
int mpkey_goto;
|
||||
int mpkey_subtitle;
|
||||
int mpkey_next_repeat_mode;
|
||||
int key_timeshift;
|
||||
int key_plugin;
|
||||
|
||||
@@ -486,12 +514,13 @@ struct SNeutrinoSettings
|
||||
int eventlist_additional;
|
||||
int channellist_additional;
|
||||
int channellist_epgtext_align_right;
|
||||
int channellist_extended;
|
||||
int channellist_progressbar_design;
|
||||
int channellist_foot;
|
||||
int channellist_new_zap_mode;
|
||||
int channellist_sort_mode;
|
||||
int channellist_numeric_adjust;
|
||||
int channellist_show_channellogo;
|
||||
int channellist_show_numbers;
|
||||
int repeat_blocker;
|
||||
int repeat_genericblocker;
|
||||
#define LONGKEYPRESS_OFF 499
|
||||
@@ -524,6 +553,7 @@ struct SNeutrinoSettings
|
||||
std::string softupdate_proxyserver;
|
||||
std::string softupdate_proxyusername;
|
||||
std::string softupdate_proxypassword;
|
||||
int softupdate_autocheck;
|
||||
int softupdate_name_mode_apply;
|
||||
int softupdate_name_mode_backup;
|
||||
int apply_settings;
|
||||
@@ -559,8 +589,6 @@ struct SNeutrinoSettings
|
||||
FONT_TYPE_EVENTLIST_ITEMSMALL,
|
||||
FONT_TYPE_EVENTLIST_DATETIME,
|
||||
FONT_TYPE_EVENTLIST_EVENT,
|
||||
FONT_TYPE_GAMELIST_ITEMLARGE,
|
||||
FONT_TYPE_GAMELIST_ITEMSMALL,
|
||||
FONT_TYPE_CHANNELLIST,
|
||||
FONT_TYPE_CHANNELLIST_DESCR,
|
||||
FONT_TYPE_CHANNELLIST_NUMBER,
|
||||
@@ -608,17 +636,15 @@ struct SNeutrinoSettings
|
||||
int backlight_standby;
|
||||
int backlight_deepstandby;
|
||||
int lcd_scroll;
|
||||
//#define FILESYSTEM_ENCODING_TO_UTF8(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a).c_str())
|
||||
//#define FILESYSTEM_ENCODING_TO_UTF8(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a).c_str())
|
||||
#define FILESYSTEM_ENCODING_TO_UTF8(a) (isUTF8(a) ? (a) : ZapitTools::Latin1_to_UTF8(a).c_str())
|
||||
#define UTF8_TO_FILESYSTEM_ENCODING(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::UTF8_to_Latin1(a).c_str())
|
||||
//#define FILESYSTEM_ENCODING_TO_UTF8_STRING(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a))
|
||||
//#define FILESYSTEM_ENCODING_TO_UTF8_STRING(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a))
|
||||
#define FILESYSTEM_ENCODING_TO_UTF8_STRING(a) (isUTF8(a) ? (a) : ZapitTools::Latin1_to_UTF8(a))
|
||||
|
||||
// pictureviewer
|
||||
int picviewer_slide_time;
|
||||
int picviewer_scaling;
|
||||
std::string picviewer_decode_server_ip;
|
||||
char picviewer_decode_server_port[6];
|
||||
|
||||
//audioplayer
|
||||
int audioplayer_display;
|
||||
@@ -635,6 +661,9 @@ struct SNeutrinoSettings
|
||||
int filebrowser_sortmethod;
|
||||
int filebrowser_denydirectoryleave;
|
||||
|
||||
//movieplayer
|
||||
int movieplayer_repeat_on;
|
||||
|
||||
//zapit setup
|
||||
std::string StartChannelTV;
|
||||
std::string StartChannelRadio;
|
||||
@@ -646,6 +675,8 @@ struct SNeutrinoSettings
|
||||
int hdd_sleep;
|
||||
int hdd_noise;
|
||||
int hdd_fs;
|
||||
enum { HDD_STATFS_OFF = 0, HDD_STATFS_ALWAYS, HDD_STATFS_RECORDING };
|
||||
int hdd_statfs_mode;
|
||||
int zap_cycle;
|
||||
int sms_channel;
|
||||
std::string font_file;
|
||||
@@ -673,8 +704,8 @@ struct SNeutrinoSettings
|
||||
ITEM_RECORD = 8,
|
||||
ITEM_MOVIEPLAYER_MB = 9,
|
||||
ITEM_TIMERLIST = 10,
|
||||
ITEM_FAVORITS = 12,
|
||||
ITEM_VTXT = 11,
|
||||
ITEM_FAVORITS = 12,
|
||||
ITEM_TECHINFO = 13,
|
||||
ITEM_REMOTE = 14,
|
||||
ITEM_PLUGIN_TYPES = 15,
|
||||
@@ -688,10 +719,22 @@ struct SNeutrinoSettings
|
||||
ITEM_FILEPLAY = 23,
|
||||
ITEM_TOOLS = 24,
|
||||
ITEM_LUA = 25,
|
||||
|
||||
ITEM_HDDMENU = 26,
|
||||
ITEM_AUDIOPLAY = 27,
|
||||
ITEM_INETPLAY = 28,
|
||||
ITEM_NETSETTINGS = 29,
|
||||
ITEM_SWUPDATE = 30,
|
||||
|
||||
ITEM_MAX // MUST be always the last in the list
|
||||
} USER_ITEM;
|
||||
std::string usermenu_text[BUTTON_MAX];
|
||||
int usermenu[BUTTON_MAX][ITEM_MAX]; // (USER_ITEM) [button][position in Menue] = feature item
|
||||
typedef struct {
|
||||
unsigned int key;
|
||||
std::string items;
|
||||
std::string title;
|
||||
std::string name;
|
||||
} usermenu_t;
|
||||
std::vector<usermenu_t *> usermenu;
|
||||
|
||||
//progressbar arrangement for infobar
|
||||
typedef enum
|
||||
@@ -799,15 +842,27 @@ class CScanSettings
|
||||
int sat_TP_pol;
|
||||
std::string sat_TP_freq;
|
||||
std::string sat_TP_rate;
|
||||
int sat_TP_delsys;
|
||||
int sat_TP_mod;
|
||||
|
||||
std::string cableName;
|
||||
int cable_TP_mod;
|
||||
int cable_TP_fec;
|
||||
std::string cable_TP_freq;
|
||||
std::string cable_TP_rate;
|
||||
int cable_TP_delsys;
|
||||
|
||||
std::string terrestrialName;
|
||||
std::string terrestrial_TP_freq;
|
||||
int terrestrial_TP_constel;
|
||||
int terrestrial_TP_bw;
|
||||
int terrestrial_TP_coderate_HP;
|
||||
int terrestrial_TP_coderate_LP;
|
||||
int terrestrial_TP_guard;
|
||||
int terrestrial_TP_hierarchy;
|
||||
int terrestrial_TP_transmit_mode;
|
||||
int terrestrial_TP_delsys;
|
||||
|
||||
std::string terrName;
|
||||
std::string terr_TP_freq;
|
||||
CScanSettings();
|
||||
|
||||
bool loadSettings(const char * const fileName);
|
||||
|
||||
Reference in New Issue
Block a user