Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: e2f4afe684
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-07 (Sun, 07 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-05-07 21:29:14 +02:00
11 changed files with 333 additions and 127 deletions

View File

@@ -607,6 +607,13 @@ struct SNeutrinoSettings
int window_height;
int eventlist_additional;
int eventlist_epgplus;
enum CHANNELLIST_ADDITIONAL_MODES
{
CHANNELLIST_ADDITIONAL_MODE_OFF = 0,
CHANNELLIST_ADDITIONAL_MODE_EPG = 1,
CHANNELLIST_ADDITIONAL_MODE_MINITV = 2
};
int channellist_additional;
int channellist_epgtext_align_right;
int channellist_foot;