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 
* needs compile fixes
* needs additional tests, of course :-)
This commit is contained in:
Stefan Seyfried
2016-10-22 11:37:40 +02:00
parent 4cb5245546 9a9fc2097b
commit 13ab1ebc8a
346 changed files with 13372 additions and 6088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/system/settings.h
View File

@@ -98,6 +98,16 @@ struct SNeutrinoTheme
unsigned char menu_Content_inactive_Text_green;
unsigned char menu_Content_inactive_Text_blue;
unsigned char menu_Foot_alpha;
unsigned char menu_Foot_red;
unsigned char menu_Foot_green;
unsigned char menu_Foot_blue;
unsigned char menu_Foot_Text_alpha;
unsigned char menu_Foot_Text_red;
unsigned char menu_Foot_Text_green;
unsigned char menu_Foot_Text_blue;
int menu_Hint_gradient;
int menu_Hint_gradient_direction;
int menu_ButtonBar_gradient;
@@ -141,6 +151,8 @@ struct SNeutrinoTheme
struct SNeutrinoSettings
{
std::string version_pseudo;
//video
int video_Format;
int video_Mode;
@@ -198,7 +210,6 @@ struct SNeutrinoSettings
int infobar_show_res;
int infobar_show_tuner;
int infobar_show_dd_available;
int wzap_time;
//audio
int audio_AnalogMode;
int audio_DolbyDigital;
@@ -443,7 +454,9 @@ struct SNeutrinoSettings
int recording_slow_warning;
int recording_startstop_msg;
int shutdown_timer_record_type;
std::list<std::string> timer_remotebox_ip;
std::string recording_filename_template;
int recording_already_found_check;
int filesystem_is_utf8;
// default plugin for ts-movieplayer (red button)
@@ -495,6 +508,12 @@ struct SNeutrinoSettings
int key_volumeup;
int key_volumedown;
int mbkey_copy_onefile;
int mbkey_copy_several;
int mbkey_cut;
int mbkey_truncate;
int mbkey_cover;
int mpkey_rewind;
int mpkey_forward;
int mpkey_pause;
@@ -557,6 +576,7 @@ struct SNeutrinoSettings
int window_width;
int window_height;
int eventlist_additional;
int eventlist_epgplus;
int channellist_additional;
int channellist_epgtext_align_right;
int channellist_progressbar_design;
@@ -632,6 +652,7 @@ struct SNeutrinoSettings
FONT_TYPE_MENU = 0,
FONT_TYPE_MENU_TITLE,
FONT_TYPE_MENU_INFO,
FONT_TYPE_MENU_FOOT,
FONT_TYPE_EPG_TITLE,
FONT_TYPE_EPG_INFO1,
FONT_TYPE_EPG_INFO2,
@@ -688,6 +709,8 @@ struct SNeutrinoSettings
int backlight_standby;
int backlight_deepstandby;
int lcd_scroll;
int lcd_notify_rclock;
//#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())
@@ -707,6 +730,8 @@ struct SNeutrinoSettings
int audioplayer_show_playlist;
int audioplayer_enable_sc_metadata;
std::string shoutcast_dev_id;
int shoutcast_enabled;
//Filebrowser
int filebrowser_showrights;
int filebrowser_sortmethod;
@@ -715,6 +740,9 @@ struct SNeutrinoSettings
//movieplayer
int movieplayer_repeat_on;
std::string youtube_dev_id;
int youtube_enabled;
std::string tmdb_api_key;
int tmdb_enabled;
//zapit setup
std::string StartChannelTV;
@@ -723,6 +751,10 @@ struct SNeutrinoSettings
t_channel_id startchannelradio_id;
int uselastchannel;
//adzap
int adzap_zapBackPeriod;
int adzap_writeData;
int power_standby;
int hdd_sleep;
int hdd_noise;
@@ -731,9 +763,13 @@ struct SNeutrinoSettings
int hdd_statfs_mode;
int zap_cycle;
int sms_channel;
int sms_movie;
std::string font_file;
std::string ttx_font_file;
int livestreamResolution;
std::string livestreamScriptPath;
// USERMENU
typedef enum
{
@@ -778,6 +814,9 @@ struct SNeutrinoSettings
ITEM_NETSETTINGS = 29,
ITEM_SWUPDATE = 30,
ITEM_LIVESTREAM_RESOLUTION = 31,
ITEM_ADZAP = 32,
ITEM_MAX // MUST be always the last in the list
} USER_ITEM;
typedef struct {
@@ -805,8 +844,6 @@ struct SNeutrinoSettings
};
};
/* some default Values */
extern const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SETTINGS_MAX];
typedef struct time_settings_t
@@ -840,20 +877,24 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define DEFAULT_LCD_AUTODIMM 0x00
#define DEFAULT_LCD_SHOW_VOLUME 0x01
#define CORNER_RADIUS_LARGE 11
#define CORNER_RADIUS_MID 7
#define CORNER_RADIUS_SMALL 5
#define CORNER_RADIUS_MIN 3
#define CORNER_RADIUS_LARGE 11
#define CORNER_RADIUS_MID 7
#define CORNER_RADIUS_SMALL 5
#define CORNER_RADIUS_MIN 3
#define CORNER_RADIUS_NONE 0
#define RADIUS_LARGE (g_settings.rounded_corners ? CORNER_RADIUS_LARGE : 0)
#define RADIUS_MID (g_settings.rounded_corners ? CORNER_RADIUS_MID : 0)
#define RADIUS_SMALL (g_settings.rounded_corners ? CORNER_RADIUS_SMALL : 0)
#define RADIUS_MIN (g_settings.rounded_corners ? CORNER_RADIUS_MIN : 0)
#define RADIUS_LARGE (g_settings.rounded_corners ? CORNER_RADIUS_LARGE : 0)
#define RADIUS_MID (g_settings.rounded_corners ? CORNER_RADIUS_MID : 0)
#define RADIUS_SMALL (g_settings.rounded_corners ? CORNER_RADIUS_SMALL : 0)
#define RADIUS_MIN (g_settings.rounded_corners ? CORNER_RADIUS_MIN : 0)
#define RADIUS_NONE 0
// shadow
#define SHADOW_OFFSET 6
/* end default values */
// offsets
#define OFFSET_SHADOW 6
#define OFFSET_INTER 6
#define OFFSET_INNER_LARGE 20
#define OFFSET_INNER_MID 10
#define OFFSET_INNER_SMALL 5
struct SglobalInfo
@@ -873,7 +914,6 @@ const int PARENTALLOCK_PROMPT_ONSTART = 1;
const int PARENTALLOCK_PROMPT_CHANGETOLOCKED = 2;
const int PARENTALLOCK_PROMPT_ONSIGNAL = 3;
class CScanSettings
{
public: