X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/00ae28e6c92cdac5687c82bc9aa3d2ca999b354f..8d1f62f6525ccfdbcb83c64f701dbbc325c37dbd:/lib/dvb/frontendparms.h

diff --git a/lib/dvb/frontendparms.h b/lib/dvb/frontendparms.h
index 466ae346..ae0891c5 100644
--- a/lib/dvb/frontendparms.h
+++ b/lib/dvb/frontendparms.h
@@ -7,6 +7,9 @@ class TerrestrialDeliverySystemDescriptor;
 
 struct eDVBFrontendParametersSatellite
 {
+#ifndef SWIG
+	void set(const SatelliteDeliverySystemDescriptor  &);
+#endif
 	struct Polarisation
 	{
 		enum {
@@ -16,94 +19,86 @@ struct eDVBFrontendParametersSatellite
 	struct Inversion
 	{
 		enum {
-			On, Off, Unknown
+			Off, On, Unknown
 		};
 	};
 	struct FEC
 	{
 		enum {
-			fNone, f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
+			fAuto, f1_2, f2_3, f3_4, f5_6, f7_8, f8_9, fNone
 		};
 	};
 	unsigned int frequency, symbol_rate;
 	int polarisation, fec, inversion, orbital_position;
-#ifndef SWIG	
-	void set(const SatelliteDeliverySystemDescriptor  &);
-#endif
 };
 
 struct eDVBFrontendParametersCable
 {
+#ifndef SWIG
+	void set(const CableDeliverySystemDescriptor  &);
+#endif
 	struct Inversion
 	{
 		enum {
-			On, Off, Unknown
+			Off, On, Unknown
 		};
 	};
 	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
 		};
 	};
 	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
 };
 
 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 };
 	};
-	
 	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
 		};
 	};
-	
 	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 +106,6 @@ struct eDVBFrontendParametersTerrestrial
 	int guard_interval;
 	int hierarchy;
 	int inversion;
-
-#ifndef SWIG	
-	void set(const TerrestrialDeliverySystemDescriptor  &);
-#endif
 };
 
 #endif