mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: 90d4cab0b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-13 (Tue, 13 Dec 2016)
This commit is contained in:
vanhofen
2016-12-13 11:21:50 +01:00
parent e36ec06294 7cbc87af3b
commit 684d853378
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/system/settings.h
View File

@@ -838,15 +838,18 @@ struct SNeutrinoSettings
// USERMENU // USERMENU
typedef enum typedef enum
{ {
BUTTON_RED = 0, // Do not change ordering of members, add new item just before BUTTON_MAX!!! // Do not change ordering of members, add new item just before BUTTON_MAX!!!
BUTTON_RED = 0,
BUTTON_GREEN = 1, BUTTON_GREEN = 1,
BUTTON_YELLOW = 2, BUTTON_YELLOW = 2,
BUTTON_BLUE = 3, BUTTON_BLUE = 3,
BUTTON_MAX // MUST be always the last in the list BUTTON_MAX // MUST be always the last in the list
} USER_BUTTON; } USER_BUTTON;
typedef enum typedef enum
{ {
ITEM_NONE = 0, // Do not change ordering of members, add new item just before ITEM_MAX!!! // Do not change ordering of members, add new item just before ITEM_MAX!!!
ITEM_NONE = 0,
ITEM_BAR = 1, ITEM_BAR = 1,
ITEM_EPG_LIST = 2, ITEM_EPG_LIST = 2,
ITEM_EPG_SUPER = 3, ITEM_EPG_SUPER = 3,
@@ -876,19 +879,17 @@ struct SNeutrinoSettings
ITEM_TOOLS = 27, ITEM_TOOLS = 27,
ITEM_LUA = 28, ITEM_LUA = 28,
ITEM_TUNER_RESTART = 29, //NI ITEM_TUNER_RESTART = 29, //NI
ITEM_HDDMENU = 30, ITEM_HDDMENU = 30,
ITEM_AUDIOPLAY = 31, ITEM_AUDIOPLAY = 31,
ITEM_INETPLAY = 32, ITEM_INETPLAY = 32,
ITEM_NETSETTINGS = 33, ITEM_NETSETTINGS = 33,
ITEM_SWUPDATE = 34, ITEM_SWUPDATE = 34,
ITEM_LIVESTREAM_RESOLUTION = 35, ITEM_LIVESTREAM_RESOLUTION = 35,
ITEM_ADZAP = 36, ITEM_ADZAP = 36,
ITEM_TESTMENU = 37, //NI ITEM_TESTMENU = 37, //NI
ITEM_MAX // MUST be always the last in the list ITEM_MAX // MUST be always the last in the list
} USER_ITEM; } USER_ITEM;
typedef struct { typedef struct {
unsigned int key; unsigned int key;
std::string items; std::string items;