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

Merge branch 'ni/cst-next' into ni/mp/cst-next

Browse Source 
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-10 17:27:55 +02:00
parent 941e37a5f1 0546f9fcf3
commit ca5c4b00d7
169 changed files with 1683 additions and 1280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/system/settings.h
View File

@@ -250,6 +250,7 @@ struct SNeutrinoSettings
int ci_save_pincode;
int ci_tuner;
int ci_rec_zapto; //NI
int ci_mode; //NI
std::string ci_pincode;
int radiotext_enable;
int easymenu;
@@ -934,18 +935,25 @@ 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
// offsets
#define OFFSET_SHADOW 6
#define OFFSET_INTER 6
//#define OFFSET_INNER_LARGE 20
//#define OFFSET_INNER_MID 10
//#define OFFSET_INNER_SMALL 5
// shadow
#define SHADOW_OFFSET 6
struct SglobalInfo
{