X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Ffrontendparms.h;h=c963a251ea4cf74ddbc79d73d313463ce5e89fd6;hb=e52de875e255153a9d15656d459fc784614fe4a6;hp=466ae346bd0e895949e1fc4f79790e911a38ee98;hpb=00ae28e6c92cdac5687c82bc9aa3d2ca999b354f;p=vuplus_dvbapp

diff --git a/lib/dvb/frontendparms.h b/lib/dvb/frontendparms.h
index 466ae34..c963a25 100644
--- a/lib/dvb/frontendparms.h
+++ b/lib/dvb/frontendparms.h
@@ -1,109 +1,127 @@
 #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
+		};
+	};
+	// dvb-s2
+	struct RollOff {
+		enum {
+			alpha_0_35, alpha_0_25, alpha_0_20
+		};
+	};
+	// only 8psk
+	struct Pilot {  
+		enum {
+			Off, On, Unknown
+		};
+	};
+	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, rolloff, pilot;
 };
+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 +129,7 @@ struct eDVBFrontendParametersTerrestrial
 	int guard_interval;
 	int hierarchy;
 	int inversion;
-
-#ifndef SWIG	
-	void set(const TerrestrialDeliverySystemDescriptor  &);
-#endif
 };
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersTerrestrial);
 
 #endif