git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add some missing changes
[enigma2.git]
/
lib
/
dvb
/
frontendparms.h
diff --git
a/lib/dvb/frontendparms.h
b/lib/dvb/frontendparms.h
index 5ce1100bf1a38fa7e36b08621a7fbdb35b1ef0f7..d38e25189f61db0a4f45061bd29fce358f00877c 100644
(file)
--- a/
lib/dvb/frontendparms.h
+++ b/
lib/dvb/frontendparms.h
@@
-7,6
+7,9
@@
class TerrestrialDeliverySystemDescriptor;
struct eDVBFrontendParametersSatellite
{
struct eDVBFrontendParametersSatellite
{
+#ifndef SWIG
+ void set(const SatelliteDeliverySystemDescriptor &);
+#endif
struct Polarisation
{
enum {
struct Polarisation
{
enum {
@@
-22,88
+25,83
@@
struct eDVBFrontendParametersSatellite
struct FEC
{
enum {
struct FEC
{
enum {
- fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, f
None
+ fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, f
8_9, fNone=15
};
};
};
};
+ bool no_rotor_command_on_tune;
unsigned int frequency, symbol_rate;
int polarisation, fec, inversion, orbital_position;
unsigned int frequency, symbol_rate;
int polarisation, fec, inversion, orbital_position;
-#ifndef SWIG
- void set(const SatelliteDeliverySystemDescriptor &);
-#endif
};
struct eDVBFrontendParametersCable
{
};
struct eDVBFrontendParametersCable
{
+#ifndef SWIG
+ void set(const CableDeliverySystemDescriptor &);
+#endif
struct Inversion
{
enum {
struct Inversion
{
enum {
- O
n, Off
, Unknown
+ O
ff, On
, Unknown
};
};
struct FEC
{
enum {
};
};
struct FEC
{
enum {
- f
None, f1_2, f2_3, f3_4, f4_5, f5_6, f6_7, f7_8, f8_9, fAuto
+ f
Auto, f1_2, f2_3, f3_4, f5_6, f7_8, f8_9, fNone=15
};
};
struct Modulation {
enum {
};
};
struct Modulation {
enum {
- QAM16, QAM32, QAM64, QAM128, QAM256, Auto
+ Auto, QAM16, QAM32, QAM64, QAM128, QAM256
};
};
};
};
-
unsigned int frequency, symbol_rate;
int modulation, inversion, fec_inner;
unsigned int frequency, symbol_rate;
int modulation, inversion, fec_inner;
-#ifndef SWIG
- void set(const CableDeliverySystemDescriptor &);
-#endif
};
struct eDVBFrontendParametersTerrestrial
{
};
struct eDVBFrontendParametersTerrestrial
{
- unsigned int frequency;
+#ifndef SWIG
+ void set(const TerrestrialDeliverySystemDescriptor &);
+#endif
struct Bandwidth {
struct Bandwidth {
- enum { Bw8MHz, Bw7MHz, Bw6MHz, BwAuto };
+ enum {
+ Bw8MHz, Bw7MHz, Bw6MHz, /*Bw5MHz,*/ BwAuto
+ }; // Bw5Mhz nyi (compatibilty with enigma1)
};
};
-
struct FEC
{
enum {
struct FEC
{
enum {
- f
None, f
1_2, f2_3, f3_4, f5_6, f7_8, fAuto
+ f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
};
};
};
};
-
struct TransmissionMode {
enum {
struct TransmissionMode {
enum {
- TM2k, TM8k, TMAuto
- };
+ TM2k, TM8k,
/*TM4k,*/
TMAuto
+ };
// TM4k nyi (compatibility with enigma1)
};
};
-
struct GuardInterval {
enum {
GI_1_32, GI_1_16, GI_1_8, GI_1_4, GI_Auto
};
};
struct GuardInterval {
enum {
GI_1_32, GI_1_16, GI_1_8, GI_1_4, GI_Auto
};
};
-
struct Hierarchy {
enum {
HNone, H1, H2, H4, HAuto
};
};
struct Hierarchy {
enum {
HNone, H1, H2, H4, HAuto
};
};
-
struct Modulation {
enum {
struct Modulation {
enum {
- QPSK, QAM16, Auto
+ QPSK, QAM16,
QAM64,
Auto
};
};
};
};
-
struct Inversion
{
enum {
struct Inversion
{
enum {
- O
n, Off
, Unknown
+ O
ff, On
, Unknown
};
};
};
};
-
+ unsigned int frequency;
int bandwidth;
int code_rate_HP, code_rate_LP;
int modulation;
int bandwidth;
int code_rate_HP, code_rate_LP;
int modulation;
@@
-111,10
+109,6
@@
struct eDVBFrontendParametersTerrestrial
int guard_interval;
int hierarchy;
int inversion;
int guard_interval;
int hierarchy;
int inversion;
-
-#ifndef SWIG
- void set(const TerrestrialDeliverySystemDescriptor &);
-#endif
};
#endif
};
#endif