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/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-15 11:49:05 +01:00
parent 2dae9f273a 39c2751a05
commit 36741264b0
265 changed files with 381 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/system/settings.h
View File

@@ -842,15 +842,18 @@ struct SNeutrinoSettings
// USERMENU
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_YELLOW = 2,
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;
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_EPG_LIST = 2,
ITEM_EPG_SUPER = 3,
@@ -879,19 +882,18 @@ struct SNeutrinoSettings
ITEM_FILEPLAY = 26,
ITEM_TOOLS = 27,
ITEM_LUA = 28,
ITEM_TUNER_RESTART = 29, //NI
ITEM_TUNER_RESTART = 29, //NI
ITEM_HDDMENU = 30,
ITEM_AUDIOPLAY = 31,
ITEM_INETPLAY = 32,
ITEM_NETSETTINGS = 33,
ITEM_SWUPDATE = 34,
ITEM_LIVESTREAM_RESOLUTION = 35,
ITEM_ADZAP = 36,
ITEM_MAX // MUST be always the last in the list
ITEM_TESTMENU = 37, //NI
ITEM_MAX // MUST be always the last in the list
} USER_ITEM;
typedef struct {
unsigned int key;
std::string items;