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

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e4e3b06de
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-10 (Sun, 10 Dec 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-12-10 21:25:09 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -32,7 +32,7 @@
#include <OpenThreads/ReentrantMutex>
#define MAX_FE 4
#define MAX_ADAPTERS 1
#define MAX_ADAPTERS 4
//#define DYNAMIC_DEMUX
//#define MAKE_FE_KEY(adapter, number) ((adapter << 8) | (number & 0xFF))

View File

@@ -634,7 +634,7 @@ void CServiceManager::ParseSatTransponders(delivery_system_t delsys, xmlNodePtr
feparams.frequency = xmlGetNumericAttribute(tps, "centre_frequency", 0);
feparams.inversion = INVERSION_AUTO;
feparams.plp_id = NO_STREAM_ID_FILTER;
feparams.plp_id = 0; // NO_STREAM_ID_FILTER = ~0U, seems not suitable here
feparams.pls_mode = PLS_Root;
feparams.pls_code = 1;