Merge branch 'dvbsi++' into next

This commit is contained in:
[CST] Focus
2013-02-13 15:34:41 +04:00
24 changed files with 347 additions and 167 deletions

View File

@@ -73,6 +73,7 @@ struct SNeutrinoSettings
int fan_speed;
int infobar_show;
int infobar_show_channellogo;
int infobar_progressbar;
int progressbar_color;
int casystem_display;
int scrambled_message;
@@ -468,7 +469,7 @@ struct SNeutrinoSettings
// Font sizes
#define FONT_TYPE_COUNT 23
#define FONT_TYPE_COUNT 24
enum FONT_TYPES {
FONT_TYPE_MENU = 0,
FONT_TYPE_MENU_TITLE = 1,
@@ -486,13 +487,14 @@ struct SNeutrinoSettings
FONT_TYPE_CHANNELLIST = 13,
FONT_TYPE_CHANNELLIST_DESCR = 14,
FONT_TYPE_CHANNELLIST_NUMBER = 15,
FONT_TYPE_CHANNEL_NUM_ZAP = 16,
FONT_TYPE_INFOBAR_NUMBER = 17,
FONT_TYPE_INFOBAR_CHANNAME = 18,
FONT_TYPE_INFOBAR_INFO = 19,
FONT_TYPE_INFOBAR_SMALL = 20,
FONT_TYPE_FILEBROWSER_ITEM = 21,
FONT_TYPE_MENU_HINT = 22
FONT_TYPE_CHANNELLIST_EVENT = 16,
FONT_TYPE_CHANNEL_NUM_ZAP = 17,
FONT_TYPE_INFOBAR_NUMBER = 18,
FONT_TYPE_INFOBAR_CHANNAME = 19,
FONT_TYPE_INFOBAR_INFO = 20,
FONT_TYPE_INFOBAR_SMALL = 21,
FONT_TYPE_FILEBROWSER_ITEM = 22,
FONT_TYPE_MENU_HINT = 23
};
// lcdd