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

diff --git a/lib/dvb/frontendparms.h b/lib/dvb/frontendparms.h
index 466ae34..0bae247 100644
--- a/lib/dvb/frontendparms.h
+++ b/lib/dvb/frontendparms.h
@@ -1,109 +1,113 @@
 #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
-	{
-		enum {
-			Horizontal, Vertical, CircularLeft, CircularRight
-		};
-	};
-	struct Inversion
-	{
-		enum {
-			On, Off, Unknown
-		};
-	};
-	struct FEC
-	{
-		enum {
-			fNone, f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
-		};
-	};
-	unsigned int frequency, symbol_rate;
-	int polarisation, fec, inversion, orbital_position;
-#ifndef SWIG	
+#ifndef SWIG
 	void set(const SatelliteDeliverySystemDescriptor  &);
 #endif
+	enum {
+		Polarisation_Horizontal, Polarisation_Vertical, Polarisation_CircularLeft, Polarisation_CircularRight
+	};
+
+	enum {
+		Inversion_Off, Inversion_On, Inversion_Unknown
+	};
+
+	enum {
+		FEC_Auto, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_8_9, FEC_3_5, FEC_4_5, FEC_9_10, FEC_None=15
+	};
+
+	enum {
+		System_DVB_S, System_DVB_S2
+	};
+
+	enum {
+		Modulation_Auto, Modulation_QPSK, Modulation_8PSK, Modulation_QAM16
+	};
+
+	// dvb-s2
+	enum {
+		RollOff_alpha_0_35, RollOff_alpha_0_25, RollOff_alpha_0_20
+	};
+
+	enum {
+		Pilot_Off, Pilot_On, Pilot_Unknown
+	};
+
+	bool no_rotor_command_on_tune;
+	unsigned int frequency, symbol_rate;
+	int polarisation, fec, inversion, orbital_position, system, modulation, rolloff, pilot;
 };
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersSatellite);
 
 struct eDVBFrontendParametersCable
 {
-	struct Inversion
-	{
-		enum {
-			On, Off, Unknown
-		};
-	};
-	struct FEC
-	{
-		enum {
-			fNone, f1_2, f2_3, f3_4, f4_5, f5_6, f6_7, f7_8, f8_9, fAuto
-		};
-	};
-	struct Modulation {
-		enum {
-			QAM16, QAM32, QAM64, QAM128, QAM256, Auto
-		};
-	};
-		
-	unsigned int frequency, symbol_rate;
-	int modulation, inversion, fec_inner;
 #ifndef SWIG
 	void set(const CableDeliverySystemDescriptor  &);
 #endif
+	enum {
+		Inversion_Off, Inversion_On, Inversion_Unknown
+	};
+
+	enum {
+		FEC_Auto, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_8_9, FEC_None=15
+	};
+
+	enum {
+		Modulation_Auto, Modulation_QAM16, Modulation_QAM32, Modulation_QAM64, Modulation_QAM128, Modulation_QAM256
+	};
+
+	unsigned int frequency, symbol_rate;
+	int modulation, inversion, fec_inner;
 };
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersCable);
 
 struct eDVBFrontendParametersTerrestrial
 {
+#ifndef SWIG
+	void set(const TerrestrialDeliverySystemDescriptor  &);
+#endif
+
+	enum {
+		Bandwidth_8MHz, Bandwidth_7MHz, Bandwidth_6MHz, Bandwidth_Auto, Bandwidth_5MHz, Bandwidth_10MHz, Bandwidth_1_712MHz
+	};
+
+	enum {
+		FEC_1_2, FEC_2_3, FEC_3_4, FEC_4_5, FEC_5_6, FEC_7_8, FEC_Auto, FEC_6_7, FEC_8_9
+	};
+
+	enum {
+		TransmissionMode_2k, TransmissionMode_8k, TransmissionMode_Auto, TransmissionMode_4k, TransmissionMode_1k, TransmissionMode_16k, TransmissionMode_32k
+	};
+
+	enum {
+		GuardInterval_1_32, GuardInterval_1_16, GuardInterval_1_8, GuardInterval_1_4, GuardInterval_Auto, GuardInterval_1_128, GuardInterval_19_128, GuardInterval_19_256
+	};
+
+	enum {
+		Hierarchy_None, Hierarchy_1, Hierarchy_2, Hierarchy_4, Hierarchy_Auto
+	};
+
+	enum {
+		Modulation_QPSK, Modulation_QAM16, Modulation_QAM64, Modulation_Auto, Modulation_QAM256
+	};
+
+	enum {
+		Inversion_Off, Inversion_On, Inversion_Unknown
+	};
+
+	enum {
+		System_DVB_T, System_DVB_T2
+	};
+
 	unsigned int frequency;
-	struct Bandwidth {
-		enum { Bw8MHz, Bw7MHz, Bw6MHz, BwAuto };
-	};
-	
-	struct FEC
-	{
-		enum {
-			fNone, f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
-		};
-	};
-	
-	struct TransmissionMode {
-		enum {
-			TM2k, TM8k, 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
-		};
-	};
-
-	struct Inversion
-	{
-		enum {
-			On, Off, Unknown
-		};
-	};
-	
 	int bandwidth;
 	int code_rate_HP, code_rate_LP;
 	int modulation;
@@ -111,10 +115,9 @@ struct eDVBFrontendParametersTerrestrial
 	int guard_interval;
 	int hierarchy;
 	int inversion;
-
-#ifndef SWIG	
-	void set(const TerrestrialDeliverySystemDescriptor  &);
-#endif
+	int system;
+	int plpid;
 };
+SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersTerrestrial);
 
 #endif