show more information in service scan (needs additional changes in skin)

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

diff --git a/lib/dvb/frontendparms.h b/lib/dvb/frontendparms.h
index 466ae346bd0e895949e1fc4f79790e911a38ee98..b8f47f43fc22f61905cc52e4b17f07cb96b006b8 100644 (file)
--- a/lib/dvb/frontendparms.h
+++ b/lib/dvb/frontendparms.h
@@ -1,109 +1,120 @@
 #ifndef __lib_dvb_frontendparms_h
 #define __lib_dvb_frontendparms_h
 
+#include <lib/python/swig.h>
+
 class SatelliteDeliverySystemDescriptor;
 class CableDeliverySystemDescriptor;
 class TerrestrialDeliverySystemDescriptor;
 
 struct eDVBFrontendParametersSatellite
 {
-       struct Polarisation
-       {
+#ifndef SWIG
+       void set(const SatelliteDeliverySystemDescriptor  &);
+#endif
+       struct Polarisation {
                enum {
                        Horizontal, Vertical, CircularLeft, CircularRight
                };
        };
-       struct Inversion
-       {
+       struct Inversion {
                enum {
-                       On, Off, Unknown
+                       Off, On, Unknown
                };
        };
-       struct FEC
-       {
+       struct FEC {
+               enum {
+                       fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, f8_9, f3_5, f4_5, f9_10, fNone=15
+               };
+       };
+       struct System {
                enum {
-                       fNone, f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
+                       DVB_S, DVB_S2
                };
        };
+       struct Modulation {
+               enum {
+                       Auto, QPSK, M8PSK, QAM_16
+               };
+       };
+       struct RollOff {  // dvb-s2
+               enum {
+                       alpha_0_35, alpha_0_25, alpha_0_20, alpha_auto
+               };
+       };
+       bool no_rotor_command_on_tune;
        unsigned int frequency, symbol_rate;
-       int polarisation, fec, inversion, orbital_position;
-#ifndef SWIG   
-       void set(const SatelliteDeliverySystemDescriptor  &);
-#endif
+       int polarisation, fec, inversion, orbital_position, system, modulation, roll_off;
 };
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersSatellite);
 
 struct eDVBFrontendParametersCable
 {
-       struct Inversion
-       {
+#ifndef SWIG
+       void set(const CableDeliverySystemDescriptor  &);
+#endif
+       struct Inversion {
                enum {
-                       On, Off, Unknown
+                       Off, On, Unknown
                };
        };
-       struct FEC
-       {
+       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
 };
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersCable);
 
 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
+               }; // Bw5Mhz nyi (compatibilty with enigma1)
        };
-       
-       struct FEC
-       {
+       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
+               }; // TM4k nyi (compatibility with enigma1)
        };
-       
        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 +122,7 @@ struct eDVBFrontendParametersTerrestrial
        int guard_interval;
        int hierarchy;
        int inversion;
-
-#ifndef SWIG   
-       void set(const TerrestrialDeliverySystemDescriptor  &);
-#endif
 };
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersTerrestrial);
 
 #endif