fix

[enigma2.git] / lib / dvb / frontendparms.h

diff --git a/lib/dvb/frontendparms.h b/lib/dvb/frontendparms.h
index e98b6dbf3352cb8da03043779fb1885a8c228010..ac6d83f945c252bbac06a618fe6cf03691fa4c9f 100644 (file)
--- a/lib/dvb/frontendparms.h
+++ b/lib/dvb/frontendparms.h
@@ -7,6 +7,9 @@ class TerrestrialDeliverySystemDescriptor;
 
 struct eDVBFrontendParametersSatellite
 {
+#ifndef SWIG
+       void set(const SatelliteDeliverySystemDescriptor  &);
+#endif
        struct Polarisation
        {
                enum {
@@ -22,88 +25,81 @@ struct eDVBFrontendParametersSatellite
        struct FEC
        {
                enum {
-                       fNone, f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
+                       fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, f8_9, fNone=15
                };
        };
+       bool no_rotor_command_on_tune;
        unsigned int frequency, symbol_rate;
        int polarisation, fec, inversion, orbital_position;
-#ifndef SWIG   
-       void set(const SatelliteDeliverySystemDescriptor  &);
-#endif
 };
 
 struct eDVBFrontendParametersCable
 {
+#ifndef SWIG
+       void set(const CableDeliverySystemDescriptor  &);
+#endif
        struct Inversion
        {
                enum {
-                       On, Off, Unknown
+                       Off, On, Unknown
                };
        };
        struct FEC
        {
                enum {
-                       fNone, f1_2, f2_3, f3_4, f4_5, f5_6, f6_7, f7_8, f8_9, fAuto
+                       fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, f8_9, fNone=15
                };
        };
        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;
-#ifndef SWIG
-       void set(const CableDeliverySystemDescriptor  &);
-#endif
 };
 
 struct eDVBFrontendParametersTerrestrial
 {
-       unsigned int frequency;
+#ifndef SWIG
+ void set(const TerrestrialDeliverySystemDescriptor  &);
+#endif
        struct Bandwidth {
-               enum { Bw8MHz, Bw7MHz, Bw6MHz, BwAuto };
+               enum { Bw8MHz, Bw7MHz, Bw6MHz, Bw5MHz, BwAuto };
        };
-       
        struct FEC
        {
                enum {
-                       fNone, f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
+                       f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
                };
        };
-       
        struct TransmissionMode {
                enum {
-                       TM2k, TM8k, TMAuto
+                       TM2k, TM8k, TM4k, TMAuto
                };
        };
-       
        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 Modulation {
                enum {
-                       QPSK, QAM16, Auto
+                       QPSK, QAM16, QAM64, Auto
                };
        };
-
        struct Inversion
        {
                enum {
-                       On, Off, Unknown
+                       Off, On, Unknown
                };
        };
-       
+       unsigned int frequency;
        int bandwidth;
        int code_rate_HP, code_rate_LP;
        int modulation;
@@ -111,10 +107,6 @@ struct eDVBFrontendParametersTerrestrial
        int guard_interval;
        int hierarchy;
        int inversion;
-
-#ifndef SWIG   
-       void set(const TerrestrialDeliverySystemDescriptor  &);
-#endif
 };
 
 #endif