From df692287d8e37024f5ea0b0cff568b7a65387e5d Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 12 Jun 2020 22:27:13 +0200 Subject: [PATCH] - rework VUPLUS defines Conflicts: src/gui/cam_menu.cpp src/neutrino_menue.cpp src/zapit/src/zapit.cpp Signed-off-by: Thilo Graf --- acinclude.m4 | 30 +++++++++++++++++++++--------- src/driver/screenshot.h | 2 +- src/gui/cam_menu.cpp | 10 +++++----- src/gui/scan_setup.cpp | 10 +++++----- src/gui/update.cpp | 2 +- src/neutrino.cpp | 14 +++++++------- src/neutrino_menue.cpp | 8 +++++++- src/system/helpers.cpp | 2 +- src/system/settings.h | 4 ++-- src/zapit/include/linux/dvb/dmx.h | 2 +- src/zapit/include/zapit/zapit.h | 2 +- src/zapit/src/frontend.cpp | 10 +++++----- src/zapit/src/zapit.cpp | 4 ++-- 13 files changed, 59 insertions(+), 41 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 29a538a12..f53b2c37c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -613,26 +613,38 @@ fi # all vuplus BOXMODELs case "$BOXMODEL" in vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo) - AC_DEFINE(BOXMODEL_VUPLUS, 1, [vuplus]) - vuplus=true + AC_DEFINE(BOXMODEL_VUPLUS_ALL, 1, [vuplus_all]) + vuplus_all=true ;; *) - vuplus=false + vuplus_all=false ;; esac -AM_CONDITIONAL(BOXMODEL_VUPLUS, test "$vuplus" = "true") +AM_CONDITIONAL(BOXMODEL_VUPLUS_ALL, test "$vuplus_all" = "true") -# all vuplus4k BOXMODELs +# all vuplus arm BOXMODELs case "$BOXMODEL" in vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) - AC_DEFINE(BOXMODEL_VUPLUS4K, 1, [vuplus4k]) - vuplus4k=true + AC_DEFINE(BOXMODEL_VUPLUS_ARM, 1, [vuplus_arm]) + vuplus_arm=true ;; *) - vuplus4k=false + vuplus_arm=false ;; esac -AM_CONDITIONAL(BOXMODEL_VUPLUS4K, test "$vuplus4k" = "true") +AM_CONDITIONAL(BOXMODEL_VUPLUS_ARM, test "$vuplus_arm" = "true") + +# all vuplus mips BOXMODELs +case "$BOXMODEL" in + vuduo) + AC_DEFINE(BOXMODEL_VUPLUS_MIPS, 1, [vuplus_mips]) + vuplus_mips=true + ;; + *) + vuplus_mips=false + ;; +esac +AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$vuplus_mips" = "true") # BOXMODELs that allows to change osd resolution case "$BOXMODEL" in diff --git a/src/driver/screenshot.h b/src/driver/screenshot.h index f5f0c7332..2e9d77c5d 100644 --- a/src/driver/screenshot.h +++ b/src/driver/screenshot.h @@ -24,7 +24,7 @@ #define __screenshot_h_ #ifdef SCREENSHOT - #if BOXMODEL_VUPLUS + #if BOXMODEL_VUPLUS_ALL #define SCREENSHOT_EXTERNAL 1 #else #define SCREENSHOT_INTERNAL 1 diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index 927840097..9b6fda523 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -79,13 +79,13 @@ const CMenuOptionChooser::keyval OPTIONS_CI_MODE_OPTIONS[] = static const CMenuOptionChooser::keyval CI_CLOCK_OPTIONS[] = { { 6, LOCALE_CI_CLOCK_NORMAL }, { 7, LOCALE_CI_CLOCK_HIGH } -#if BOXMODEL_VUPLUS +#if BOXMODEL_VUPLUS_ALL ,{ 12, LOCALE_CI_CLOCK_EXTRA_HIGH } #endif }; #define CI_CLOCK_OPTION_COUNT (sizeof(CI_CLOCK_OPTIONS)/sizeof(CMenuOptionChooser::keyval)) -#if BOXMODEL_VUPLUS +#if BOXMODEL_VUPLUS_ALL #define CI_DELAY_OPTION_COUNT 5 static const CMenuOptionChooser::keyval_ext CI_DELAY_OPTIONS[CI_DELAY_OPTION_COUNT] = { { 16, NONEXISTANT_LOCALE, "16" }, @@ -158,7 +158,7 @@ int CCAMMenuHandler::doMainMenu() int CiSlots = ca ? ca->GetNumberCISlots() : 0; if(CiSlots) { -#if BOXMODEL_VUPLUS //FIXME: loacles not available +#if BOXMODEL_VUPLUS_ALL //FIXME: loacles not available cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_DELAY, &g_settings.ci_delay, CI_DELAY_OPTIONS, CI_DELAY_OPTION_COUNT, true, this)); #endif cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_RESET_STANDBY, &g_settings.ci_standby_reset, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); @@ -219,7 +219,7 @@ if (i == 0) { // only for slot 0 valid - fix later #else cammenu->addItem(new CMenuOptionNumberChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock[i], true, 6, 12, this)); #endif -#if BOXMODEL_VUPLUS +#if BOXMODEL_VUPLUS_ALL cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_RPR, &g_settings.ci_rpr[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); #endif cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_IGNORE_MSG, &g_settings.ci_ignore_messages[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); @@ -620,7 +620,7 @@ int CCAMMenuHandler::doMenu(int slot, CA_SLOT_TYPE slotType) bool CCAMMenuHandler::changeNotify(const neutrino_locale_t OptionName, void * Data) { -#if BOXMODEL_VUPLUS +#if BOXMODEL_VUPLUS_ALL if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_DELAY)) { printf("CCAMMenuHandler::changeNotify: ci_delay %d\n", g_settings.ci_delay); ca->SetCIDelay(g_settings.ci_delay); diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index d1beee63f..c8c368d8b 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -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 @@ -797,7 +797,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) @@ -946,7 +946,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()); @@ -1184,7 +1184,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()); @@ -1353,7 +1353,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()); diff --git a/src/gui/update.cpp b/src/gui/update.cpp index e69f45f7f..5578987f4 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -675,7 +675,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) bool active = !strcmp(c, to_string(i).c_str()); bool enable = true; std::string m_title = "Partition " + to_string(i); -#if BOXMODEL_VUPLUS4K +#if BOXMODEL_VUPLUS_ARM // own partition blocked, because fix needed for flashing own partition if (active) enable = false; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index bbaa72c79..c60fb1223 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -465,7 +465,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.ci_tuner = configfile.getInt32("ci_tuner", -1); g_settings.ci_rec_zapto = configfile.getInt32("ci_rec_zapto", 0); g_settings.ci_mode = configfile.getInt32("ci_mode", 0); -#if BOXMODEL_VUPLUS +#if BOXMODEL_VUPLUS_ALL g_settings.ci_delay = configfile.getInt32("ci_delay", 128); #endif // ci-settings for each slot @@ -491,7 +491,7 @@ int CNeutrinoApp::loadSetup(const char * fname) #else g_settings.ci_clock[i] = configfile.getInt32(cfg_key, 9); #endif -#if BOXMODEL_VUPLUS +#if BOXMODEL_VUPLUS_ALL sprintf(cfg_key, "ci_rpr_%d", i); g_settings.ci_rpr[i] = configfile.getInt32(cfg_key, 9); #endif @@ -1424,7 +1424,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32("ci_tuner", g_settings.ci_tuner); configfile.setInt32("ci_rec_zapto", g_settings.ci_rec_zapto); configfile.setInt32("ci_mode", g_settings.ci_mode); -#if BOXMODEL_VUPLUS +#if BOXMODEL_VUPLUS_ALL configfile.setInt32("ci_delay", g_settings.ci_delay); #endif // ci-settings for each slot @@ -1437,7 +1437,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setString(cfg_key, g_settings.ci_pincode[i]); sprintf(cfg_key, "ci_clock_%d", i); configfile.setInt32(cfg_key, g_settings.ci_clock[i]); -#if BOXMODEL_VUPLUS +#if BOXMODEL_VUPLUS_ALL sprintf(cfg_key, "ci_rpr_%d", i); configfile.setInt32(cfg_key, g_settings.ci_rpr[i]); #endif @@ -2691,7 +2691,7 @@ TIMER_START(); ZapStart_arg.uselastchannel = g_settings.uselastchannel; ZapStart_arg.video_mode = g_settings.video_Mode; memcpy(ZapStart_arg.ci_clock, g_settings.ci_clock, sizeof(g_settings.ci_clock)); -#if BOXMODEL_VUPLUS +#if BOXMODEL_VUPLUS_ALL ZapStart_arg.ci_delay = g_settings.ci_delay; memcpy(ZapStart_arg.ci_rpr, g_settings.ci_rpr, sizeof(g_settings.ci_rpr)); #endif @@ -5227,7 +5227,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 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME -#elif BOXMODEL_VUPLUS +#elif BOXMODEL_VUPLUS_ALL g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_playpause ); #elif BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_play ); @@ -5265,7 +5265,7 @@ void CNeutrinoApp::loadKeys(const char * fname) #if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_playpause ); g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause ); -#elif BOXMODEL_VUPLUS +#elif BOXMODEL_VUPLUS_ALL g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_play ); g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause ); #else diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 8b07e0857..4cc41502e 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -387,9 +387,15 @@ void CNeutrinoApp::InitMenuService() //1st section*************************************************************************************************** + bool force_fesetup = false; +#if BOXMODEL_VUPLUS_ALL + if (CFEManager::getInstance()->haveCable() || CFEManager::getInstance()->haveTerr()) + force_fesetup = true; +#endif + CMenuForwarder * mf; // tuner setup - if(CFEManager::getInstance()->haveSat() || CFEManager::getInstance()->getFrontendCount() > 1) { + if (CFEManager::getInstance()->haveSat() || CFEManager::getInstance()->getFrontendCount() > 1 || force_fesetup) { mf = new CMenuForwarder(LOCALE_SATSETUP_FE_SETUP, true, NULL, CScanSetup::getInstance(), "setup_frontend", CRCInput::RC_red); mf->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_SCAN_FESETUP); personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_TUNER]); diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp index d9ac7fcf3..f34c494ae 100644 --- a/src/system/helpers.cpp +++ b/src/system/helpers.cpp @@ -1802,7 +1802,7 @@ int getActivePartition() { int c = -1; -#if BOXMODEL_VUPLUS4K +#if BOXMODEL_VUPLUS_ARM FILE *f; f = fopen("/proc/cmdline", "r"); if (f) diff --git a/src/system/settings.h b/src/system/settings.h index 9f0018a62..805ff234a 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -286,7 +286,7 @@ struct SNeutrinoSettings int ci_tuner; int ci_rec_zapto; int ci_mode; -#if BOXMODEL_VUPLUS +#if BOXMODEL_VUPLUS_ALL int ci_delay; #endif // ci-settings for each slot @@ -294,7 +294,7 @@ struct SNeutrinoSettings int ci_save_pincode[4]; std::string ci_pincode[4]; int ci_clock[4]; -#if BOXMODEL_VUPLUS +#if BOXMODEL_VUPLUS_ALL int ci_rpr[4]; #endif diff --git a/src/zapit/include/linux/dvb/dmx.h b/src/zapit/include/linux/dvb/dmx.h index 551bb1331..bcd7569c2 100644 --- a/src/zapit/include/linux/dvb/dmx.h +++ b/src/zapit/include/linux/dvb/dmx.h @@ -274,7 +274,7 @@ typedef enum { DMX_SOURCE_FRONT23, #endif #endif -#if BOXMODEL_VUPLUS4K +#if BOXMODEL_VUPLUS_ARM DMX_SOURCE_DVR0 = 32, #else DMX_SOURCE_DVR0 = 16, diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h index f022c15bf..c65d5de12 100644 --- a/src/zapit/include/zapit/zapit.h +++ b/src/zapit/include/zapit/zapit.h @@ -45,7 +45,7 @@ typedef struct ZAPIT_start_arg uint32_t osd_resolution; int volume; int ci_clock[4]; -#if BOXMODEL_VUPLUS +#if BOXMODEL_VUPLUS_ALL int ci_delay; int ci_rpr[4]; #endif diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index b3b286088..cc9eb2daa 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -344,7 +344,7 @@ void CFrontend::getFEInfo(void) if ((line.find("Name:") != std::string::npos) && found) { //printf("NIM SOCKET: %s\n",line.substr(line.find_first_of(":")+2).c_str()); -#if BOXMODEL_VUPLUS +#if BOXMODEL_VUPLUS_ALL sprintf(info.name,"%s", line.substr(line.find_first_of(":") + 9).c_str()); #else std::string tmp = info.name; @@ -1448,7 +1448,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_VUPLUS4K +#if BOXMODEL_VUPLUS_ARM pilot = PILOT_AUTO; #else pilot = PILOT_ON; @@ -1457,7 +1457,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_VUPLUS4K +#if BOXMODEL_VUPLUS_ARM pilot = PILOT_AUTO; #else pilot = PILOT_ON; @@ -1469,7 +1469,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_VUPLUS4K +#if BOXMODEL_VUPLUS_ARM pilot = PILOT_AUTO; #else pilot = PILOT_ON; @@ -1487,7 +1487,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_VUPLUS4K +#if BOXMODEL_VUPLUS_ARM pilot = PILOT_AUTO; #else pilot = PILOT_ON; diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 8b5d79fc9..8625e052b 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -2604,8 +2604,8 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg) #endif } -#if BOXMODEL_VUPLUS - //dvb wait delay for ci response +#if BOXMODEL_VUPLUS_ALL + // dvb wait delay for ci response ca->SetCIDelay(ZapStart_arg->ci_delay); /// relevant pids routing