nicer code (api v3 / oldapi)

[enigma2.git] / lib / dvb / sec.cpp

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 99e39ea69424f4c98eae16218abb4a6840a9099f..1555090cb0a321acf4c9e5c13e7f7c00bb4ba856 100644 (file)
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -1,10 +1,27 @@
+#include <config.h>
 #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>
 
 DEFINE_REF(eDVBSatelliteEquipmentControl);
 
-RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, struct dvb_frontend_parameters &parm, eDVBFrontendParametersSatellite &sat)
+eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl()
+{
+}
+
+RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat)
 {
        int hi;
        eDebug("(very) ugly and hardcoded eDVBSatelliteEquipmentControl");
@@ -15,24 +32,23 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, struct dvb
                hi = 0;
        
        if (hi)
-               parm.frequency = sat.frequency - 10600000;
+               parm.FREQUENCY = sat.frequency - 10600000;
        else
-               parm.frequency = sat.frequency -  9750000;
+               parm.FREQUENCY = sat.frequency -  9750000;
        
 //     frontend.sentDiseqc(...);
 
-       parm.inversion = sat.inversion ? INVERSION_ON : INVERSION_OFF;
+       parm.INVERSION = (!sat.inversion) ? INVERSION_ON : INVERSION_OFF;
 
        switch (sat.fec)
        {
 //             case 1:
 //             case ...:
        default:
-               parm.u.qpsk.fec_inner = FEC_AUTO;
+               parm.u.qpsk.FEC_INNER = FEC_AUTO;
                break;
        }
-       parm.u.qpsk.symbol_rate = sat.symbol_rate;
-       
+       parm.u.qpsk.SYMBOLRATE = sat.symbol_rate;
 
        frontend.setVoltage((sat.polarisation == eDVBFrontendParametersSatellite::Polarisation::Vertical) ? iDVBFrontend::voltage13 : iDVBFrontend::voltage18);
 
@@ -52,7 +68,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, struct dvb
 
        frontend.sendDiseqc(diseqc);
        frontend.setTone(hi ? iDVBFrontend::toneOn : iDVBFrontend::toneOff);
-       
+
        return 0;
 }