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 649aff77ece2475a87a21becdcfa22297946e855..b8f47f43fc22f61905cc52e4b17f07cb96b006b8 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
 
+#include <lib/python/swig.h>
+
 class SatelliteDeliverySystemDescriptor;
 class CableDeliverySystemDescriptor;
 class TerrestrialDeliverySystemDescriptor;
@@ -10,44 +12,55 @@ struct eDVBFrontendParametersSatellite
 #ifndef SWIG
        void set(const SatelliteDeliverySystemDescriptor  &);
 #endif
-       struct Polarisation
-       {
+       struct Polarisation {
                enum {
                        Horizontal, Vertical, CircularLeft, CircularRight
                };
        };
-       struct Inversion
-       {
+       struct Inversion {
                enum {
                        Off, On, Unknown
                };
        };
-       struct FEC
-       {
+       struct FEC {
                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, f3_5, f4_5, f9_10, fNone=15
+               };
+       };
+       struct System {
+               enum {
+                       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;
+       int polarisation, fec, inversion, orbital_position, system, modulation, roll_off;
 };
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersSatellite);
 
 struct eDVBFrontendParametersCable
 {
 #ifndef SWIG
        void set(const CableDeliverySystemDescriptor  &);
 #endif
-       struct Inversion
-       {
+       struct Inversion {
                enum {
                        Off, On, Unknown
                };
        };
-       struct FEC
-       {
+       struct FEC {
                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 {
@@ -58,25 +71,27 @@ struct eDVBFrontendParametersCable
        unsigned int frequency, symbol_rate;
        int modulation, inversion, fec_inner;
 };
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersCable);
 
 struct eDVBFrontendParametersTerrestrial
 {
 #ifndef SWIG
- void set(const TerrestrialDeliverySystemDescriptor  &);
+       void set(const TerrestrialDeliverySystemDescriptor  &);
 #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 {
-                       TM2k, TM8k, TM4k, TMAuto
-               };
+                       TM2k, TM8k, /*TM4k,*/ TMAuto
+               }; // TM4k nyi (compatibility with enigma1)
        };
        struct GuardInterval {
                enum {
@@ -108,5 +123,6 @@ struct eDVBFrontendParametersTerrestrial
        int hierarchy;
        int inversion;
 };
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersTerrestrial);
 
 #endif