Revert "s2x changes (thx Janus)"

This reverts commit 069ee72b89
because it doesn't want build.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b72ddc10d
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-10-30 (Wed, 30 Oct 2019)



------------------
This commit was generated by Migit

data/locale/deutsch.locale

@@ -584,7 +584,6 @@ extra.tp_delsys_dtmb DTMB
 extra.tp_delsys_dvbc DVB-C
 extra.tp_delsys_dvbs DVB-S
 extra.tp_delsys_dvbs2 DVB-S2
-extra.tp_delsys_dvbs2x DVB-S2X
 extra.tp_delsys_dvbt DVB-T
 extra.tp_delsys_dvbt2 DVB-T2
 extra.tp_delsys_isdbc ISDB-C
@@ -614,16 +613,13 @@ extra.tp_hierarchy_none None
 extra.tp_mod Modulation
 extra.tp_mod_128 QAM/128
 extra.tp_mod_16 QAM/16
-extra.tp_mod_16a 16APSK
 extra.tp_mod_256 QAM/256
 extra.tp_mod_32 QAM/32
-extra.tp_mod_32a 32APSK
 extra.tp_mod_4 QPSK
 extra.tp_mod_4_nr QAM/4-NR
 extra.tp_mod_64 QAM/64
 extra.tp_mod_8 8PSK
-extra.tp_mod_8a 8APSK
+extra.tp_mod_auto QAM/AUTO
-extra.tp_mod_auto AUTO
 extra.tp_pilot Pilot
 extra.tp_pilot_auto Auto (HW)
 extra.tp_pilot_auto_sw Auto (SW)

data/locale/english.locale

@@ -584,7 +584,6 @@ extra.tp_delsys_dtmb DTMB
 extra.tp_delsys_dvbc DVB-C
 extra.tp_delsys_dvbs DVB-S
 extra.tp_delsys_dvbs2 DVB-S2
-extra.tp_delsys_dvbs2x DVB-S2X
 extra.tp_delsys_dvbt DVB-T
 extra.tp_delsys_dvbt2 DVB-T2
 extra.tp_delsys_isdbc ISDB-C
@@ -614,16 +613,13 @@ extra.tp_hierarchy_none None
 extra.tp_mod Modulation
 extra.tp_mod_128 QAM/128
 extra.tp_mod_16 QAM/16
-extra.tp_mod_16a 16APSK
 extra.tp_mod_256 QAM/256
 extra.tp_mod_32 QAM/32
-extra.tp_mod_32a 32APSK
 extra.tp_mod_4 QPSK
 extra.tp_mod_4_nr QAM/4-NR
 extra.tp_mod_64 QAM/64
 extra.tp_mod_8 8PSK
-extra.tp_mod_8a 8APSK
+extra.tp_mod_auto QAM/AUTO
-extra.tp_mod_auto AUTO
 extra.tp_pilot Pilot
 extra.tp_pilot_auto Auto (HW)
 extra.tp_pilot_auto_sw Auto (SW)

src/gui/scan_setup.cpp

@@ -104,12 +104,11 @@ const CMenuOptionChooser::keyval SATSETUP_DISEQC_OPTIONS[SATSETUP_DISEQC_OPTION_
 //	{ SMATV_REMOTE_TUNING,	LOCALE_SATSETUP_SMATVREMOTE }
 };
 
-#define SATSETUP_SCANTP_DELSYS_COUNT	6
+#define SATSETUP_SCANTP_DELSYS_COUNT	5
 const CMenuOptionChooser::keyval SATSETUP_SCANTP_DELSYS[SATSETUP_SCANTP_DELSYS_COUNT] =
 {
 	{ DVB_S,		LOCALE_EXTRA_TP_DELSYS_DVBS },
 	{ DVB_S2,		LOCALE_EXTRA_TP_DELSYS_DVBS2 },
-	{ DVB_S2X,		LOCALE_EXTRA_TP_DELSYS_DVBS2X },
 	{ DSS,			LOCALE_EXTRA_TP_DELSYS_DSS },
 	{ ISDBS,		LOCALE_EXTRA_TP_DELSYS_ISDBS },
 	{ TURBO,		LOCALE_EXTRA_TP_DELSYS_TURBO }
@@ -257,14 +256,11 @@ const CMenuOptionChooser::keyval TERRSETUP_SCANTP_TRANSMIT_MODE[TERRSETUP_SCANTP
 	{ TRANSMISSION_MODE_AUTO,  LOCALE_EXTRA_TP_TRANSMIT_MODE_AUTO  }
 };
 
-#define SATSETUP_SCANTP_MOD_COUNT 6
+#define SATSETUP_SCANTP_MOD_COUNT 3
 const CMenuOptionChooser::keyval SATSETUP_SCANTP_MOD[SATSETUP_SCANTP_MOD_COUNT] =
 {
 	{ QPSK,     LOCALE_EXTRA_TP_MOD_4    },
 	{ PSK_8,    LOCALE_EXTRA_TP_MOD_8    },
-	{ APSK_8,   LOCALE_EXTRA_TP_MOD_8A   },
-	{ APSK_16,  LOCALE_EXTRA_TP_MOD_16A  },
-	{ APSK_32,  LOCALE_EXTRA_TP_MOD_32A  },
 	{ QAM_AUTO, LOCALE_EXTRA_TP_MOD_AUTO }
 };
 

src/system/locals.h

@@ -611,7 +611,6 @@ typedef enum
 	LOCALE_EXTRA_TP_DELSYS_DVBC,
 	LOCALE_EXTRA_TP_DELSYS_DVBS,
 	LOCALE_EXTRA_TP_DELSYS_DVBS2,
-	LOCALE_EXTRA_TP_DELSYS_DVBS2X,
 	LOCALE_EXTRA_TP_DELSYS_DVBT,
 	LOCALE_EXTRA_TP_DELSYS_DVBT2,
 	LOCALE_EXTRA_TP_DELSYS_ISDBC,
@@ -641,15 +640,12 @@ typedef enum
 	LOCALE_EXTRA_TP_MOD,
 	LOCALE_EXTRA_TP_MOD_128,
 	LOCALE_EXTRA_TP_MOD_16,
-	LOCALE_EXTRA_TP_MOD_16A,
 	LOCALE_EXTRA_TP_MOD_256,
 	LOCALE_EXTRA_TP_MOD_32,
-	LOCALE_EXTRA_TP_MOD_32A,
 	LOCALE_EXTRA_TP_MOD_4,
 	LOCALE_EXTRA_TP_MOD_4_NR,
 	LOCALE_EXTRA_TP_MOD_64,
 	LOCALE_EXTRA_TP_MOD_8,
-	LOCALE_EXTRA_TP_MOD_8A,
 	LOCALE_EXTRA_TP_MOD_AUTO,
 	LOCALE_EXTRA_TP_PILOT,
 	LOCALE_EXTRA_TP_PILOT_AUTO,

src/system/locals_intern.h

@@ -611,7 +611,6 @@ const char * locale_real_names[] =
 	"extra.tp_delsys_dvbc",
 	"extra.tp_delsys_dvbs",
 	"extra.tp_delsys_dvbs2",
-	"extra.tp_delsys_dvbs2x",
 	"extra.tp_delsys_dvbt",
 	"extra.tp_delsys_dvbt2",
 	"extra.tp_delsys_isdbc",
@@ -641,15 +640,12 @@ const char * locale_real_names[] =
 	"extra.tp_mod",
 	"extra.tp_mod_128",
 	"extra.tp_mod_16",
-	"extra.tp_mod_16a",
 	"extra.tp_mod_256",
 	"extra.tp_mod_32",
-	"extra.tp_mod_32a",
 	"extra.tp_mod_4",
 	"extra.tp_mod_4_nr",
 	"extra.tp_mod_64",
 	"extra.tp_mod_8",
-	"extra.tp_mod_8a",
 	"extra.tp_mod_auto",
 	"extra.tp_pilot",
 	"extra.tp_pilot_auto",

src/zapit/include/private/linux/dvb/frontend.h

@@ -169,7 +169,7 @@ typedef enum fe_code_rate {
 
 
 typedef enum fe_modulation {
-	QPSK,		// mod=1
+	QPSK,
 	QAM_16,
 	QAM_32,
 	QAM_64,
@@ -178,12 +178,11 @@ typedef enum fe_modulation {
 	QAM_AUTO,
 	VSB_8,
 	VSB_16,
-	PSK_8,		// mod=2 ==> S2(X)
+	PSK_8,
-	APSK_16,	// mod=4 ==> S2(X)   16APSK
+	APSK_16,
-	APSK_32,	// mod=5 ==> S2(X)   32APSK ==> ?? 64APSK, 128APSK, 256APSK (mod= 6,7,8)
+	APSK_32,
 	DQPSK,
-	QAM_4_NR,
+	QAM_4_NR
-	APSK_8		// mod=3 ==> S2(X)    8APSK
 } fe_modulation_t;
 
 typedef enum fe_transmit_mode {

src/zapit/include/zapit/client/zapitclient.h

@@ -28,7 +28,6 @@
 
 /* zapit */
 #include "zapittypes.h"
-#include <zapit/frontend_c.h>
 #include <connection/basicclient.h>
 
 #define CHANNEL_NAME_SIZE 40
@@ -384,9 +383,6 @@ class CZapitClient:public CBasicClient
 	/* send diseqc 1.2 motor command */
 	void sendMotorCommand(uint8_t cmdtype, uint8_t address, uint8_t cmd, uint8_t num_parameters, uint8_t param1, uint8_t param2);
 
-	//CFrontend GetLiveFrontend() { return live_fe; };
-
-
 	/****************************************/
 	/*					*/
 	/* Scanning stuff			*/
@@ -540,4 +536,5 @@ class CZapitClient:public CBasicClient
 #define PAL	0
 #define NTSC	1
 
+
 #endif

src/zapit/src/frontend.cpp

@@ -375,10 +375,6 @@ void CFrontend::getFEInfo(void)
 				deliverySystemMask |= DVB_S2;
 				isMultistream = info.caps & FE_CAN_MULTISTREAM;
 				break;
-			case SYS_DVBS2X:
-				deliverySystemMask |= DVB_S2X;
-				isMultistream = info.caps & FE_CAN_MULTISTREAM;
-				break;
 			case SYS_DTMB:
 				deliverySystemMask |= DTMB;
 				break;
@@ -960,15 +956,6 @@ void CFrontend::getDelSys(delivery_system_t delsys, int f, int m, const char *&f
 		case PSK_8:
 			mod = "8PSK";
 			break;
-		case APSK_8:
-			mod = "8APSK";
-			break;
-		case APSK_16:
-			mod = "16APSK";
-			break;
-		case APSK_32:
-			mod = "32APSK";
-			break;
 		default:
 			printf("[frontend] unknown modulation %d!\n", m);
 			mod = "UNKNOWN";
@@ -1096,9 +1083,6 @@ fe_delivery_system_t CFrontend::getFEDeliverySystem(delivery_system_t Delsys)
 	case DVB_S2:
 		delsys = SYS_DVBS2;
 		break;
-	case DVB_S2X:
-		delsys = SYS_DVBS2X;
-		break;
 	case DVB_T:
 		delsys = SYS_DVBT;
 		break;
@@ -1188,9 +1172,6 @@ uint32_t CFrontend::getXMLDeliverySystem(delivery_system_t delsys)
 	case ISDBT:
 		delnr = 11;
 		break;
-	case DVB_S2X:
-		delnr = 12;
-		break;
 	default:
 		printf("%s: unknown delivery system (%d)\n", __FUNCTION__, delsys);
 		delnr = 0;

src/zapit/src/getservices.cpp

@@ -715,15 +715,6 @@ void CServiceManager::ParseSatTransponders(delivery_system_t delsys, xmlNodePtr
 			case 2: // 8PSK
 				feparams.modulation = PSK_8;
 				break;
-			case 3: // 8APSK
-				feparams.modulation = APSK_8;
-				break;
-			case 4: // 16APSK
-				feparams.modulation = APSK_16;
-				break;
-			case 5: // 32APSK
-				feparams.modulation = APSK_32;
-				break;
 			default:
 				feparams.modulation = QAM_AUTO;
 				fprintf(stderr, "[getservices] %s: unknown modulation %d!\n", __func__, modulation);