From 1092f800ce2617e91d2309fbfd24ad7a3e37f3f0 Mon Sep 17 00:00:00 2001 From: BPanther Date: Mon, 13 Apr 2020 23:07:32 +0200 Subject: [PATCH] remove pilot auto_sw Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a1e940c23294f6897059355dbdaebe250097227a Author: BPanther Date: 2020-04-13 (Mon, 13 Apr 2020) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 3 +-- data/locale/english.locale | 3 +-- src/gui/scan_setup.cpp | 5 ++--- src/system/locals.h | 1 - src/system/locals_intern.h | 1 - src/zapit/include/zapit/frontend_types.h | 3 +-- src/zapit/src/frontend.cpp | 4 +--- 7 files changed, 6 insertions(+), 14 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index bae6f9f64..d5712f99d 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -648,8 +648,7 @@ extra.tp_mod_8 8PSK extra.tp_mod_8a 8APSK extra.tp_mod_auto AUTO extra.tp_pilot Pilot -extra.tp_pilot_auto Auto (HW) -extra.tp_pilot_auto_sw Auto (SW) +extra.tp_pilot_auto Auto extra.tp_plc PLM Code extra.tp_pli Stream ID extra.tp_plm PLS Modus diff --git a/data/locale/english.locale b/data/locale/english.locale index 8ebd9b145..540ce0204 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -648,8 +648,7 @@ extra.tp_mod_8 8PSK extra.tp_mod_8a 8APSK extra.tp_mod_auto AUTO extra.tp_pilot Pilot -extra.tp_pilot_auto Auto (HW) -extra.tp_pilot_auto_sw Auto (SW) +extra.tp_pilot_auto Auto extra.tp_plc PLM Code extra.tp_pli Stream ID extra.tp_plm PLS Mode diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 8dd5ecad9..0741828a9 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -323,13 +323,12 @@ const CMenuOptionChooser::keyval SATSETUP_SCANTP_POL[SATSETUP_SCANTP_POL_COUNT] { 3, LOCALE_EXTRA_TP_POL_R } }; -#define SATSETUP_SCANTP_PILOT_COUNT 4 +#define SATSETUP_SCANTP_PILOT_COUNT 3 const CMenuOptionChooser::keyval SATSETUP_SCANTP_PILOT[SATSETUP_SCANTP_PILOT_COUNT] = { { ZPILOT_ON, LOCALE_OPTIONS_ON }, { ZPILOT_OFF, LOCALE_OPTIONS_OFF }, - { ZPILOT_AUTO, LOCALE_EXTRA_TP_PILOT_AUTO }, - { ZPILOT_AUTO_SW, LOCALE_EXTRA_TP_PILOT_AUTO_SW } + { ZPILOT_AUTO, LOCALE_EXTRA_TP_PILOT_AUTO } }; #define OPTIONS_SOUTH0_NORTH1_OPTION_COUNT 2 diff --git a/src/system/locals.h b/src/system/locals.h index 26635b6c1..55e096cdb 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -676,7 +676,6 @@ typedef enum LOCALE_EXTRA_TP_MOD_AUTO, LOCALE_EXTRA_TP_PILOT, LOCALE_EXTRA_TP_PILOT_AUTO, - LOCALE_EXTRA_TP_PILOT_AUTO_SW, LOCALE_EXTRA_TP_PLC, LOCALE_EXTRA_TP_PLI, LOCALE_EXTRA_TP_PLM, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index d42fcc2d1..f9e0c29f9 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -676,7 +676,6 @@ const char * locale_real_names[] = "extra.tp_mod_auto", "extra.tp_pilot", "extra.tp_pilot_auto", - "extra.tp_pilot_auto_sw", "extra.tp_plc", "extra.tp_pli", "extra.tp_plm", diff --git a/src/zapit/include/zapit/frontend_types.h b/src/zapit/include/zapit/frontend_types.h index 37acb4f45..39e684f91 100644 --- a/src/zapit/include/zapit/frontend_types.h +++ b/src/zapit/include/zapit/frontend_types.h @@ -105,8 +105,7 @@ typedef enum { typedef enum { ZPILOT_ON, ZPILOT_OFF, - ZPILOT_AUTO, - ZPILOT_AUTO_SW + ZPILOT_AUTO } zapit_pilot_t; typedef enum { diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index b8e6745fb..67f251bc6 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -1575,10 +1575,8 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p pilot = PILOT_OFF; break; case ZPILOT_AUTO: - pilot = PILOT_AUTO; - break; - case ZPILOT_AUTO_SW: default: + pilot = PILOT_AUTO; break; }