mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tuxbox/master'

Browse Source
This commit is contained in:
Stefan Seyfried
2016-11-12 18:06:26 +01:00
parent 5257d14c13 ad7947d11a
commit 2c92d112d0
58 changed files with 6498 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/system/settings.h
View File

@@ -149,6 +149,15 @@ struct SNeutrinoTheme
unsigned char clock_Digit_blue;
};
struct timer_remotebox_item
{
unsigned int port;
std::string user;
std::string pass;
std::string rbname;
std::string rbaddress;
};
struct SNeutrinoSettings
{
std::string version_pseudo;
@@ -454,7 +463,7 @@ struct SNeutrinoSettings
int recording_slow_warning;
int recording_startstop_msg;
int shutdown_timer_record_type;
std::list<std::string> timer_remotebox_ip;
std::vector<timer_remotebox_item> timer_remotebox_ip;
std::string recording_filename_template;
int recording_already_found_check;
@@ -673,6 +682,9 @@ struct SNeutrinoSettings
FONT_TYPE_INFOBAR_SMALL,
FONT_TYPE_FILEBROWSER_ITEM,
FONT_TYPE_MENU_HINT,
FONT_TYPE_MOVIEBROWSER_HEAD,
FONT_TYPE_MOVIEBROWSER_LIST,
FONT_TYPE_MOVIEBROWSER_INFO,
FONT_TYPE_SUBTITLES,
FONT_TYPE_COUNT
};
@@ -895,7 +907,7 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define OFFSET_INNER_LARGE 20
#define OFFSET_INNER_MID 10
#define OFFSET_INNER_SMALL 5
#define OFFSET_INNER_MIN 2
struct SglobalInfo
{