From f79ff1bfa4b91bc13a584365a52a807864e4aa90 Mon Sep 17 00:00:00 2001 From: BPanther Date: Mon, 20 Jan 2020 23:49:32 +0100 Subject: [PATCH] fix vuuno4k Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/3f09a7dc0d91f80a1a7b28f71c734f87efc87ce3 Author: BPanther Date: 2020-01-20 (Mon, 20 Jan 2020) --- src/gui/scan_setup.h | 2 +- src/zapit/include/linux/dvb/dmx.h | 6 +++--- src/zapit/include/zapit/femanager.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/scan_setup.h b/src/gui/scan_setup.h index ec62bd5f9..7d07442a1 100644 --- a/src/gui/scan_setup.h +++ b/src/gui/scan_setup.h @@ -69,7 +69,7 @@ class CScanSetup : public CMenuTarget, public CChangeObserver #if BOXMODEL_VUULTIMO4K std::string modestr[24]; #else -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K std::string modestr[16]; #else std::string modestr[4]; diff --git a/src/zapit/include/linux/dvb/dmx.h b/src/zapit/include/linux/dvb/dmx.h index 65e60471e..551bb1331 100644 --- a/src/zapit/include/linux/dvb/dmx.h +++ b/src/zapit/include/linux/dvb/dmx.h @@ -77,7 +77,7 @@ typedef enum dmx_ts_pes DMX_PES_SUBTITLE3, DMX_PES_PCR3, -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K DMX_PES_AUDIO4, DMX_PES_VIDEO4, DMX_PES_TELETEXT4, @@ -250,7 +250,7 @@ typedef enum { DMX_SOURCE_FRONT1, DMX_SOURCE_FRONT2, DMX_SOURCE_FRONT3, -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K DMX_SOURCE_FRONT4, DMX_SOURCE_FRONT5, DMX_SOURCE_FRONT6, @@ -282,7 +282,7 @@ typedef enum { DMX_SOURCE_DVR1, DMX_SOURCE_DVR2, DMX_SOURCE_DVR3 -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K , DMX_SOURCE_DVR4 , DMX_SOURCE_DVR5 , DMX_SOURCE_DVR6 diff --git a/src/zapit/include/zapit/femanager.h b/src/zapit/include/zapit/femanager.h index f665ee683..b6a1b3024 100644 --- a/src/zapit/include/zapit/femanager.h +++ b/src/zapit/include/zapit/femanager.h @@ -35,7 +35,7 @@ #define MAX_FE 24 #define MAX_ADAPTERS 4 #else -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K #define MAX_FE 16 #define MAX_ADAPTERS 4 #else