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

1 files changed, 15 insertions, 19 deletions

diff --git a/lib/dvb/frontendparms.h b/lib/dvb/frontendparms.h
index 86aea7cf..b8f47f43 100644
--- 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,38 +12,32 @@ 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, f3_5, f4_5, f9_10, fNone=15
 		};
 	};
-	struct System
-	{
+	struct System {
 		enum {
 			DVB_S, DVB_S2
 		};
 	};
-	struct Modulation
-	{
+	struct Modulation {
 		enum {
 			Auto, QPSK, M8PSK, QAM_16
 		};
 	};
-	struct RollOff  // dvb-s2
-	{
+	struct RollOff {  // dvb-s2
 		enum {
 			alpha_0_35, alpha_0_25, alpha_0_20, alpha_auto
 		};
@@ -50,20 +46,19 @@ struct eDVBFrontendParametersSatellite
 	unsigned int frequency, symbol_rate;
 	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=15
 		};
@@ -76,19 +71,19 @@ 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
 		}; // Bw5Mhz nyi (compatibilty with enigma1)
 	};
-	struct FEC
-	{
+	struct FEC {
 		enum {
 			f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
 		};
@@ -128,5 +123,6 @@ struct eDVBFrontendParametersTerrestrial
 	int hierarchy;
 	int inversion;
 };
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersTerrestrial);
 
 #endif