vuuno4k and vuuno4kse added

Origin commit data
------------------
Commit: 75de99d28d
Author: max_10 <max_10@gmx.de>
Date: 2019-10-12 (Sat, 12 Oct 2019)

Origin message was:
------------------
- vuuno4k and vuuno4kse added
This commit is contained in:
max_10
2019-10-12 20:21:37 +02:00
committed by vanhofen
parent 33fbed288c
commit 8fef6fe1a9
8 changed files with 35 additions and 17 deletions

View File

@@ -227,7 +227,7 @@ class CRCInput
RC_tv = KEY_TV,
RC_radio = KEY_RADIO,
RC_text = KEY_TEXT,
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
RC_info = KEY_NONEXISTING,
RC_epg = KEY_INFO,
#else

View File

@@ -69,7 +69,7 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
#if BOXMODEL_VUULTIMO4K
std::string modestr[24];
#else
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE
std::string modestr[16];
#else
std::string modestr[4];

View File

@@ -5255,7 +5255,7 @@ void CNeutrinoApp::loadKeys(const char * fname)
g_settings.key_list_end = tconfig->getInt32( "key_list_end", (unsigned int)CRCInput::RC_nokey );
#if BOXMODEL_HD51 || BOXMODEL_HD60
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME
#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO
#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_playpause );
#else
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_pause );
@@ -5291,7 +5291,7 @@ void CNeutrinoApp::loadKeys(const char * fname)
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K
g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_playpause );
g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause );
#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO
#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_play );
g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause );
#else

View File

@@ -35,7 +35,7 @@
#define MAX_FE 24
#define MAX_ADAPTERS 4
#else
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE
#define MAX_FE 16
#define MAX_ADAPTERS 4
#else

View File

@@ -1233,7 +1233,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p
case FEC_2_3:
fec = FEC_2_3;
if (feparams->delsys == DVB_S2 && feparams->modulation == PSK_8)
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
pilot = PILOT_AUTO;
#else
pilot = PILOT_ON;
@@ -1242,7 +1242,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p
case FEC_3_4:
fec = FEC_3_4;
if (feparams->delsys == DVB_S2 && feparams->modulation == PSK_8)
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
pilot = PILOT_AUTO;
#else
pilot = PILOT_ON;
@@ -1254,7 +1254,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p
case FEC_5_6:
fec = FEC_5_6;
if (feparams->delsys == DVB_S2 && feparams->modulation == PSK_8)
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
pilot = PILOT_AUTO;
#else
pilot = PILOT_ON;
@@ -1272,7 +1272,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p
case FEC_3_5:
fec = FEC_3_5;
if (feparams->delsys == DVB_S2 && feparams->modulation == PSK_8)
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
pilot = PILOT_AUTO;
#else
pilot = PILOT_ON;