mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove pilot auto_sw

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
data/locale/deutsch.locale
View File

@@ -648,8 +648,7 @@ extra.tp_mod_8 8PSK
extra.tp_mod_8a 8APSK extra.tp_mod_8a 8APSK
extra.tp_mod_auto AUTO extra.tp_mod_auto AUTO
extra.tp_pilot Pilot extra.tp_pilot Pilot
extra.tp_pilot_auto Auto (HW) extra.tp_pilot_auto Auto
extra.tp_pilot_auto_sw Auto (SW)
extra.tp_plc PLM Code extra.tp_plc PLM Code
extra.tp_pli Stream ID extra.tp_pli Stream ID
extra.tp_plm PLS Modus extra.tp_plm PLS Modus

3
data/locale/english.locale
View File

@@ -648,8 +648,7 @@ extra.tp_mod_8 8PSK
extra.tp_mod_8a 8APSK extra.tp_mod_8a 8APSK
extra.tp_mod_auto AUTO extra.tp_mod_auto AUTO
extra.tp_pilot Pilot extra.tp_pilot Pilot
extra.tp_pilot_auto Auto (HW) extra.tp_pilot_auto Auto
extra.tp_pilot_auto_sw Auto (SW)
extra.tp_plc PLM Code extra.tp_plc PLM Code
extra.tp_pli Stream ID extra.tp_pli Stream ID
extra.tp_plm PLS Mode extra.tp_plm PLS Mode

5
src/gui/scan_setup.cpp
View File

@@ -323,13 +323,12 @@ const CMenuOptionChooser::keyval SATSETUP_SCANTP_POL[SATSETUP_SCANTP_POL_COUNT]
{ 3, LOCALE_EXTRA_TP_POL_R } { 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] = const CMenuOptionChooser::keyval SATSETUP_SCANTP_PILOT[SATSETUP_SCANTP_PILOT_COUNT] =
{ {
{ ZPILOT_ON, LOCALE_OPTIONS_ON }, { ZPILOT_ON, LOCALE_OPTIONS_ON },
{ ZPILOT_OFF, LOCALE_OPTIONS_OFF }, { ZPILOT_OFF, LOCALE_OPTIONS_OFF },
{ ZPILOT_AUTO, LOCALE_EXTRA_TP_PILOT_AUTO }, { ZPILOT_AUTO, LOCALE_EXTRA_TP_PILOT_AUTO }
{ ZPILOT_AUTO_SW, LOCALE_EXTRA_TP_PILOT_AUTO_SW }
}; };
#define OPTIONS_SOUTH0_NORTH1_OPTION_COUNT 2 #define OPTIONS_SOUTH0_NORTH1_OPTION_COUNT 2

1
src/system/locals.h
View File

@@ -676,7 +676,6 @@ typedef enum
LOCALE_EXTRA_TP_MOD_AUTO, LOCALE_EXTRA_TP_MOD_AUTO,
LOCALE_EXTRA_TP_PILOT, LOCALE_EXTRA_TP_PILOT,
LOCALE_EXTRA_TP_PILOT_AUTO, LOCALE_EXTRA_TP_PILOT_AUTO,
LOCALE_EXTRA_TP_PILOT_AUTO_SW,
LOCALE_EXTRA_TP_PLC, LOCALE_EXTRA_TP_PLC,
LOCALE_EXTRA_TP_PLI, LOCALE_EXTRA_TP_PLI,
LOCALE_EXTRA_TP_PLM, LOCALE_EXTRA_TP_PLM,

1
src/system/locals_intern.h
View File

@@ -676,7 +676,6 @@ const char * locale_real_names[] =
"extra.tp_mod_auto", "extra.tp_mod_auto",
"extra.tp_pilot", "extra.tp_pilot",
"extra.tp_pilot_auto", "extra.tp_pilot_auto",
"extra.tp_pilot_auto_sw",
"extra.tp_plc", "extra.tp_plc",
"extra.tp_pli", "extra.tp_pli",
"extra.tp_plm", "extra.tp_plm",

3
src/zapit/include/zapit/frontend_types.h
View File

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

4
src/zapit/src/frontend.cpp
View File

@@ -1575,10 +1575,8 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p
pilot = PILOT_OFF; pilot = PILOT_OFF;
break; break;
case ZPILOT_AUTO: case ZPILOT_AUTO:
pilot = PILOT_AUTO;
break;
case ZPILOT_AUTO_SW:
default: default:
pilot = PILOT_AUTO;
break; break;
} }