nicer code (api v3 / oldapi)

4 files changed, 20 insertions, 45 deletions

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 5eb61077..690824db 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -361,11 +361,7 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 	if (m_type == -1)
 		return -ENODEV;
 
-#if HAVE_DVB_API_VERSION < 3
-	FrontendParameters parm;
-#else
-	dvb_frontend_parameters parm;
-#endif
+	FRONTENDPARAMETERS parm;
 
 	feEvent(-1);
 	
diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 878b3619..306613da 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -4,6 +4,9 @@
 #include <config.h>
 #if HAVE_DVB_API_VERSION < 3
 #include <ost/frontend.h>
+#define FRONTENDPARAMETERS FrontendParameters
+#else
+#define FRONTENDPARAMETERS struct frontend_parameters
 #endif
 #include <lib/base/object.h>
 #include <lib/base/ebase.h>
@@ -271,11 +274,7 @@ public:
 class iDVBSatelliteEquipmentControl: public iObject
 {
 public:
-#if HAVE_DVB_API_VERSION < 3
-	virtual RESULT prepare(iDVBFrontend &frontend, FrontendParameters &parm, eDVBFrontendParametersSatellite &sat)=0;
-#else
-	virtual RESULT prepare(iDVBFrontend &frontend, struct dvb_frontend_parameters &parm, eDVBFrontendParametersSatellite &sat)=0;
-#endif
+	virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat)=0;
 };
 
 struct eDVBCIRouting
diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 1ec1d5a2..1555090c 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -2,8 +2,16 @@
 #include <lib/dvb/sec.h>
 #if HAVE_DVB_API_VERSION < 3
 #include <ost/frontend.h>
+#define INVERSION Inversion
+#define FREQUENCY Frequency
+#define FEC_INNER FEC_inner
+#define SYMBOLRATE SymbolRate
 #else
 #include <linux/dvb/frontend.h>
+#define INVERSION inversion
+#define FREQUENCY frequency
+#define FEC_INNER fec_inner
+#define SYMBOLRATE symbol_rate
 #endif
 #include <lib/base/eerror.h>
 
@@ -13,11 +21,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl()
 {
 }
 
-#if HAVE_DVB_API_VERSION < 3
-RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FrontendParameters &parm, eDVBFrontendParametersSatellite &sat)
-#else
-RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, struct dvb_frontend_parameters &parm, eDVBFrontendParametersSatellite &sat)
-#endif
+RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat)
 {
 	int hi;
 	eDebug("(very) ugly and hardcoded eDVBSatelliteEquipmentControl");
@@ -28,43 +32,23 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, struct dvb
 		hi = 0;
 	
 	if (hi)
-#if HAVE_DVB_API_VERSION < 3
-		parm.Frequency = sat.frequency - 10600000;
-#else
-		parm.frequency = sat.frequency - 10600000;
-#endif
+		parm.FREQUENCY = sat.frequency - 10600000;
 	else
-#if HAVE_DVB_API_VERSION < 3
-		parm.Frequency = sat.frequency -  9750000;
-#else
-		parm.frequency = sat.frequency -  9750000;
-#endif
+		parm.FREQUENCY = sat.frequency -  9750000;
 	
 //	frontend.sentDiseqc(...);
 
-#if HAVE_DVB_API_VERSION < 3
-	parm.Inversion = (!sat.inversion) ? INVERSION_ON : INVERSION_OFF;
-#else
-	parm.inversion = (!sat.inversion) ? INVERSION_ON : INVERSION_OFF;
-#endif
+	parm.INVERSION = (!sat.inversion) ? INVERSION_ON : INVERSION_OFF;
 
 	switch (sat.fec)
 	{
 //		case 1:
 //		case ...:
 	default:
-#if HAVE_DVB_API_VERSION < 3
-		parm.u.qpsk.FEC_inner = FEC_AUTO;
-#else
-		parm.u.qpsk.fec_inner = FEC_AUTO;
-#endif
+		parm.u.qpsk.FEC_INNER = FEC_AUTO;
 		break;
 	}
-#if HAVE_DVB_API_VERSION < 3
-	parm.u.qpsk.SymbolRate = sat.symbol_rate;
-#else
-	parm.u.qpsk.symbol_rate = sat.symbol_rate;
-#endif
+	parm.u.qpsk.SYMBOLRATE = sat.symbol_rate;
 
 	frontend.setVoltage((sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Vertical) ? iDVBFrontend::voltage13 : iDVBFrontend::voltage18);
 
diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 18aec679..0bda004c 100644
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -9,11 +9,7 @@ class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
 public:
 	DECLARE_REF;
 	eDVBSatelliteEquipmentControl();
-#if HAVE_DVB_API_VERSION < 3
-	RESULT prepare(iDVBFrontend &frontend, FrontendParameters &parm, eDVBFrontendParametersSatellite &sat);
-#else
-	RESULT prepare(iDVBFrontend &frontend, struct dvb_frontend_parameters &parm, eDVBFrontendParametersSatellite &sat);
-#endif
+	RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat);
 };
 
 #endif