rework VUPLUS defines

Origin commit data
------------------
Branch: ni/coolstream
Commit: e299801f1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-06-12 (Fri, 12 Jun 2020)

Origin message was:
------------------
- rework VUPLUS defines

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-06-12 22:27:13 +02:00
parent e3d2e27d76
commit 9b6e6bea2f
13 changed files with 53 additions and 41 deletions

View File

@@ -71,7 +71,7 @@ extern char zapit_long[21];
//static int all_usals = 1;
//sat_iterator_t sit;
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
static const char * tuner_desc[24] = { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X" };
#endif
@@ -813,7 +813,7 @@ int CScanSetup::showScanMenuFrontendSetup()
snprintf(tmp, sizeof(tmp), "config_frontend%d", i);
char name[255];
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
snprintf(name, sizeof(name), "%s %d: %s [%s] %s", g_Locale->getText(LOCALE_SATSETUP_FE_TUNER), i+1,
fe->isHybrid() ? g_Locale->getText(LOCALE_SCANTS_ACTHYBRID)
: fe->hasSat() ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE)
@@ -959,7 +959,7 @@ int CScanSetup::showFrontendSetup(int number)
dmode = fe_config.diseqcType;
char name[255];
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
snprintf(name, sizeof(name), "%s %d: [%s] %s", g_Locale->getText(LOCALE_SATSETUP_FE_TUNER), number+1, tuner_desc[number], fe->getName());
#else
snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_FE_TUNER), number+1, fe->getName());
@@ -1197,7 +1197,7 @@ int CScanSetup::showScanMenuLnbSetup()
CFrontend * fe = CFEManager::getInstance()->getFE(fenumber);
char name[255];
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
snprintf(name, sizeof(name), "%s %d: [%s] %s", g_Locale->getText(LOCALE_SATSETUP_SATELLITE), fenumber+1, tuner_desc[fenumber], fe->getName());
#else
snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_SATELLITE), fenumber+1, fe->getName());
@@ -1366,7 +1366,7 @@ int CScanSetup::showScanMenuSatFind()
r_system = ALL_SAT;
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
snprintf(name, sizeof(name), "%s %d: [%s] %s", g_Locale->getText(LOCALE_MOTORCONTROL_HEAD), fenumber+1, tuner_desc[fenumber], fe->getName());
#else
snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_MOTORCONTROL_HEAD), fenumber+1, fe->getName());