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

Revert "s2x changes (thx Janus)"

Browse Source 
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
This commit is contained in:
vanhofen
2019-10-30 22:59:48 +01:00
parent 069ee72b89
commit 5cb09db847
9 changed files with 51 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/locale/deutsch.locale
View File

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

6
data/locale/english.locale
View File

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

8
src/gui/scan_setup.cpp
View File

@@ -104,12 +104,11 @@ const CMenuOptionChooser::keyval SATSETUP_DISEQC_OPTIONS[SATSETUP_DISEQC_OPTION_
// { SMATV_REMOTE_TUNING, LOCALE_SATSETUP_SMATVREMOTE } // { 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] = const CMenuOptionChooser::keyval SATSETUP_SCANTP_DELSYS[SATSETUP_SCANTP_DELSYS_COUNT] =
{ {
{ DVB_S, LOCALE_EXTRA_TP_DELSYS_DVBS }, { DVB_S, LOCALE_EXTRA_TP_DELSYS_DVBS },
{ DVB_S2, LOCALE_EXTRA_TP_DELSYS_DVBS2 }, { DVB_S2, LOCALE_EXTRA_TP_DELSYS_DVBS2 },
{ DVB_S2X, LOCALE_EXTRA_TP_DELSYS_DVBS2X },
{ DSS, LOCALE_EXTRA_TP_DELSYS_DSS }, { DSS, LOCALE_EXTRA_TP_DELSYS_DSS },
{ ISDBS, LOCALE_EXTRA_TP_DELSYS_ISDBS }, { ISDBS, LOCALE_EXTRA_TP_DELSYS_ISDBS },
{ TURBO, LOCALE_EXTRA_TP_DELSYS_TURBO } { 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 } { 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] = const CMenuOptionChooser::keyval SATSETUP_SCANTP_MOD[SATSETUP_SCANTP_MOD_COUNT] =
{ {
{ QPSK, LOCALE_EXTRA_TP_MOD_4 }, { QPSK, LOCALE_EXTRA_TP_MOD_4 },
{ PSK_8, LOCALE_EXTRA_TP_MOD_8 }, { 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 } { QAM_AUTO, LOCALE_EXTRA_TP_MOD_AUTO }
}; };

4
src/system/locals.h
View File

@@ -611,7 +611,6 @@ typedef enum
LOCALE_EXTRA_TP_DELSYS_DVBC, LOCALE_EXTRA_TP_DELSYS_DVBC,
LOCALE_EXTRA_TP_DELSYS_DVBS, LOCALE_EXTRA_TP_DELSYS_DVBS,
LOCALE_EXTRA_TP_DELSYS_DVBS2, LOCALE_EXTRA_TP_DELSYS_DVBS2,
LOCALE_EXTRA_TP_DELSYS_DVBS2X,
LOCALE_EXTRA_TP_DELSYS_DVBT, LOCALE_EXTRA_TP_DELSYS_DVBT,
LOCALE_EXTRA_TP_DELSYS_DVBT2, LOCALE_EXTRA_TP_DELSYS_DVBT2,
LOCALE_EXTRA_TP_DELSYS_ISDBC, LOCALE_EXTRA_TP_DELSYS_ISDBC,
@@ -641,15 +640,12 @@ typedef enum
LOCALE_EXTRA_TP_MOD, LOCALE_EXTRA_TP_MOD,
LOCALE_EXTRA_TP_MOD_128, LOCALE_EXTRA_TP_MOD_128,
LOCALE_EXTRA_TP_MOD_16, LOCALE_EXTRA_TP_MOD_16,
LOCALE_EXTRA_TP_MOD_16A,
LOCALE_EXTRA_TP_MOD_256, LOCALE_EXTRA_TP_MOD_256,
LOCALE_EXTRA_TP_MOD_32, LOCALE_EXTRA_TP_MOD_32,
LOCALE_EXTRA_TP_MOD_32A,
LOCALE_EXTRA_TP_MOD_4, LOCALE_EXTRA_TP_MOD_4,
LOCALE_EXTRA_TP_MOD_4_NR, LOCALE_EXTRA_TP_MOD_4_NR,
LOCALE_EXTRA_TP_MOD_64, LOCALE_EXTRA_TP_MOD_64,
LOCALE_EXTRA_TP_MOD_8, LOCALE_EXTRA_TP_MOD_8,
LOCALE_EXTRA_TP_MOD_8A,
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,

4
src/system/locals_intern.h
View File

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

11
src/zapit/include/private/linux/dvb/frontend.h
View File

@@ -169,7 +169,7 @@ typedef enum fe_code_rate {
typedef enum fe_modulation { typedef enum fe_modulation {
QPSK, // mod=1 QPSK,
QAM_16, QAM_16,
QAM_32, QAM_32,
QAM_64, QAM_64,
@@ -178,12 +178,11 @@ typedef enum fe_modulation {
QAM_AUTO, QAM_AUTO,
VSB_8, VSB_8,
VSB_16, 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, DQPSK,
QAM_4_NR, QAM_4_NR
APSK_8 // mod=3 ==> S2(X) 8APSK
} fe_modulation_t; } fe_modulation_t;
typedef enum fe_transmit_mode { typedef enum fe_transmit_mode {

87
src/zapit/include/zapit/client/zapitclient.h
View File

@@ -28,7 +28,6 @@
/* zapit */ /* zapit */
#include "zapittypes.h" #include "zapittypes.h"
#include <zapit/frontend_c.h>
#include <connection/basicclient.h> #include <connection/basicclient.h>
#define CHANNEL_NAME_SIZE 40 #define CHANNEL_NAME_SIZE 40
@@ -57,12 +56,12 @@ class CZapitClient:public CBasicClient
EVT_SCAN_FAILED, EVT_SCAN_FAILED,
EVT_SCAN_NUM_TRANSPONDERS, EVT_SCAN_NUM_TRANSPONDERS,
EVT_SCAN_REPORT_NUM_SCANNED_TRANSPONDERS, EVT_SCAN_REPORT_NUM_SCANNED_TRANSPONDERS,
EVT_SCAN_REPORT_FREQUENCYP, EVT_SCAN_REPORT_FREQUENCYP,
EVT_SCAN_SERVICENAME, EVT_SCAN_SERVICENAME,
EVT_SCAN_FOUND_A_CHAN, EVT_SCAN_FOUND_A_CHAN,
EVT_SCAN_FOUND_TV_CHAN, EVT_SCAN_FOUND_TV_CHAN,
EVT_SCAN_FOUND_RADIO_CHAN, EVT_SCAN_FOUND_RADIO_CHAN,
EVT_SCAN_FOUND_DATA_CHAN, EVT_SCAN_FOUND_DATA_CHAN,
EVT_SCAN_SATELLITE, EVT_SCAN_SATELLITE,
EVT_SCAN_NUM_CHANNELS, EVT_SCAN_NUM_CHANNELS,
EVT_SCAN_PROVIDER, EVT_SCAN_PROVIDER,
@@ -96,13 +95,13 @@ class CZapitClient:public CBasicClient
BM_CREATESATELLITEBOUQUET BM_CREATESATELLITEBOUQUET
}; };
enum scanType enum scanType
{ {
ST_TVRADIO, ST_TVRADIO,
ST_TV, ST_TV,
ST_RADIO, ST_RADIO,
ST_ALL ST_ALL
}; };
typedef enum channelsMode_ typedef enum channelsMode_
{ {
@@ -152,9 +151,9 @@ class CZapitClient:public CBasicClient
struct responseGetBouquets struct responseGetBouquets
{ {
unsigned int bouquet_nr; unsigned int bouquet_nr;
char name[30]; char name[30];
bool locked; bool locked;
bool hidden; bool hidden;
}; };
typedef std::vector<responseGetBouquets> BouquetList; typedef std::vector<responseGetBouquets> BouquetList;
@@ -163,7 +162,7 @@ class CZapitClient:public CBasicClient
{ {
unsigned int nr; unsigned int nr;
t_channel_id channel_id; t_channel_id channel_id;
char name[CHANNEL_NAME_SIZE]; char name[CHANNEL_NAME_SIZE];
t_satellite_position satellitePosition; t_satellite_position satellitePosition;
unsigned char service_type; unsigned char service_type;
}; };
@@ -185,12 +184,12 @@ class CZapitClient:public CBasicClient
#define DESC_MAX_LEN 38 //component descriptor name length + " (AC3)" #define DESC_MAX_LEN 38 //component descriptor name length + " (AC3)"
struct responseGetAPIDs struct responseGetAPIDs
{ {
uint32_t pid; uint32_t pid;
char desc[DESC_MAX_LEN]; char desc[DESC_MAX_LEN];
int is_ac3; int is_ac3;
int is_aac; int is_aac;
int is_eac3; int is_eac3;
int component_tag; int component_tag;
}; };
typedef std::vector<responseGetAPIDs> APIDList; typedef std::vector<responseGetAPIDs> APIDList;
@@ -212,16 +211,16 @@ class CZapitClient:public CBasicClient
t_original_network_id onid; t_original_network_id onid;
t_service_id sid; t_service_id sid;
t_transport_stream_id tsid; t_transport_stream_id tsid;
unsigned short vpid; unsigned short vpid;
unsigned short vtype; unsigned short vtype;
unsigned short apid; unsigned short apid;
unsigned short pcrpid; unsigned short pcrpid;
unsigned short vtxtpid; unsigned short vtxtpid;
unsigned int tsfrequency; unsigned int tsfrequency;
unsigned char polarisation; unsigned char polarisation;
unsigned char diseqc; unsigned char diseqc;
unsigned short pmtpid; unsigned short pmtpid;
unsigned short pmt_version; unsigned short pmt_version;
uint32_t rate; uint32_t rate;
fe_code_rate fec; fe_code_rate fec;
}; };
@@ -247,11 +246,11 @@ class CZapitClient:public CBasicClient
unsigned int sig; unsigned int sig;
unsigned int snr; unsigned int snr;
unsigned long ber; unsigned long ber;
// maybe later... // maybe later...
// int has_lock; // int has_lock;
// int has_signal; // int has_signal;
// int has_sync; // int has_sync;
// int has_carrier; // int has_carrier;
}; };
@@ -340,8 +339,8 @@ class CZapitClient:public CBasicClient
/* reloads channels and services*/ /* reloads channels and services*/
void reinitChannels(); void reinitChannels();
/* called when sectionsd updates currentservices.xml */ /* called when sectionsd updates currentservices.xml */
void reloadCurrentServices(); void reloadCurrentServices();
/* get current APID-List */ /* get current APID-List */
void getPIDS( responseGetPIDs& pids ); void getPIDS( responseGetPIDs& pids );
@@ -384,9 +383,6 @@ class CZapitClient:public CBasicClient
/* send diseqc 1.2 motor command */ /* 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); 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 */ /* Scanning stuff */
@@ -425,7 +421,7 @@ class CZapitClient:public CBasicClient
void setScanBouquetMode(const bouquetMode mode); void setScanBouquetMode(const bouquetMode mode);
/* set Scan-Type for channel search */ /* set Scan-Type for channel search */
//void setScanType(const scanType mode); //void setScanType(const scanType mode);
/* get FrontEnd Signal Params */ /* get FrontEnd Signal Params */
//void getFESignal (struct responseFESignal& f); //void getFESignal (struct responseFESignal& f);
@@ -540,4 +536,5 @@ class CZapitClient:public CBasicClient
#define PAL 0 #define PAL 0
#define NTSC 1 #define NTSC 1
#endif #endif

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

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

9
src/zapit/src/getservices.cpp
View File

@@ -715,15 +715,6 @@ void CServiceManager::ParseSatTransponders(delivery_system_t delsys, xmlNodePtr
case 2: // 8PSK case 2: // 8PSK
feparams.modulation = PSK_8; feparams.modulation = PSK_8;
break; 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: default:
feparams.modulation = QAM_AUTO; feparams.modulation = QAM_AUTO;
fprintf(stderr, "[getservices] %s: unknown modulation %d!\n", __func__, modulation); fprintf(stderr, "[getservices] %s: unknown modulation %d!\n", __func__, modulation);