git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
beautify bottombar.png
[enigma2.git]
/
lib
/
dvb
/
frontendparms.h
diff --git
a/lib/dvb/frontendparms.h
b/lib/dvb/frontendparms.h
index ae0891c59f68e75de6894881b47e37e1c5602130..961dfd00e481336cc4c24aec0b175de5512ff49d 100644
(file)
--- a/
lib/dvb/frontendparms.h
+++ b/
lib/dvb/frontendparms.h
@@
-1,6
+1,8
@@
#ifndef __lib_dvb_frontendparms_h
#define __lib_dvb_frontendparms_h
#ifndef __lib_dvb_frontendparms_h
#define __lib_dvb_frontendparms_h
+#include <lib/python/swig.h>
+
class SatelliteDeliverySystemDescriptor;
class CableDeliverySystemDescriptor;
class TerrestrialDeliverySystemDescriptor;
class SatelliteDeliverySystemDescriptor;
class CableDeliverySystemDescriptor;
class TerrestrialDeliverySystemDescriptor;
@@
-10,43
+12,61
@@
struct eDVBFrontendParametersSatellite
#ifndef SWIG
void set(const SatelliteDeliverySystemDescriptor &);
#endif
#ifndef SWIG
void set(const SatelliteDeliverySystemDescriptor &);
#endif
- struct Polarisation
- {
+ struct Polarisation {
enum {
Horizontal, Vertical, CircularLeft, CircularRight
};
};
enum {
Horizontal, Vertical, CircularLeft, CircularRight
};
};
- struct Inversion
- {
+ struct Inversion {
enum {
Off, On, Unknown
};
};
enum {
Off, On, Unknown
};
};
- struct FEC
- {
+ struct FEC {
enum {
enum {
- fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, f8_9, f
None
+ fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, f8_9, f
3_5, f4_5, f9_10, fNone=15
};
};
};
};
+ struct System {
+ enum {
+ DVB_S, DVB_S2
+ };
+ };
+ struct Modulation {
+ enum {
+ Auto, QPSK, M8PSK, QAM_16
+ };
+ };
+ // dvb-s2
+ struct RollOff {
+ enum {
+ alpha_0_35, alpha_0_25, alpha_0_20
+ };
+ };
+ struct Pilot {
+ enum {
+ Off, On, Unknown
+ };
+ };
+ bool no_rotor_command_on_tune;
unsigned int frequency, symbol_rate;
unsigned int frequency, symbol_rate;
- int polarisation, fec, inversion, orbital_position;
+ int polarisation, fec, inversion, orbital_position
, system, modulation, rolloff, pilot
;
};
};
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersSatellite);
struct eDVBFrontendParametersCable
{
#ifndef SWIG
void set(const CableDeliverySystemDescriptor &);
#endif
struct eDVBFrontendParametersCable
{
#ifndef SWIG
void set(const CableDeliverySystemDescriptor &);
#endif
- struct Inversion
- {
+ struct Inversion {
enum {
Off, On, Unknown
};
};
enum {
Off, On, Unknown
};
};
- struct FEC
- {
+ struct FEC {
enum {
enum {
- fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, f8_9, fNone
+ fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, f8_9, fNone
=15
};
};
struct Modulation {
};
};
struct Modulation {
@@
-57,25
+77,27
@@
struct eDVBFrontendParametersCable
unsigned int frequency, symbol_rate;
int modulation, inversion, fec_inner;
};
unsigned int frequency, symbol_rate;
int modulation, inversion, fec_inner;
};
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersCable);
struct eDVBFrontendParametersTerrestrial
{
#ifndef SWIG
struct eDVBFrontendParametersTerrestrial
{
#ifndef SWIG
- void set(const TerrestrialDeliverySystemDescriptor &);
+
void set(const TerrestrialDeliverySystemDescriptor &);
#endif
struct Bandwidth {
#endif
struct Bandwidth {
- enum { Bw8MHz, Bw7MHz, Bw6MHz, Bw5MHz, BwAuto };
+ enum {
+ Bw8MHz, Bw7MHz, Bw6MHz, /*Bw5MHz,*/ BwAuto
+ }; // Bw5Mhz nyi (compatibilty with enigma1)
};
};
- struct FEC
- {
+ struct FEC {
enum {
f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
};
};
struct TransmissionMode {
enum {
enum {
f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
};
};
struct TransmissionMode {
enum {
- TM2k, TM8k,
TM4k,
TMAuto
- };
+ TM2k, TM8k,
/*TM4k,*/
TMAuto
+ };
// TM4k nyi (compatibility with enigma1)
};
struct GuardInterval {
enum {
};
struct GuardInterval {
enum {
@@
-107,5
+129,6
@@
struct eDVBFrontendParametersTerrestrial
int hierarchy;
int inversion;
};
int hierarchy;
int inversion;
};
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersTerrestrial);
#endif
#endif