remove pilot auto_sw

Origin commit data
------------------
Branch: ni/coolstream
Commit: a1e940c232
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-04-13 (Mon, 13 Apr 2020)


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

------------------
This commit was generated by Migit
This commit is contained in:
BPanther
2020-04-13 23:07:32 +02:00
committed by vanhofen
parent 275c27fe86
commit 1092f800ce
7 changed files with 6 additions and 14 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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,

View File

@@ -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",

View File

@@ -105,8 +105,7 @@ typedef enum {
typedef enum {
ZPILOT_ON,
ZPILOT_OFF,
ZPILOT_AUTO,
ZPILOT_AUTO_SW
ZPILOT_AUTO
} zapit_pilot_t;
typedef enum {

View File

@@ -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;
}