X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3bad22d5566624804a73b3791980bab2d84c8266..54bd4123728628a6f77bad2584b70d1353a91666:/lib/dvb/sec.cpp diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp index c033266a..1555090c 100644 --- a/lib/dvb/sec.cpp +++ b/lib/dvb/sec.cpp @@ -1,5 +1,18 @@ +#include #include +#if HAVE_DVB_API_VERSION < 3 +#include +#define INVERSION Inversion +#define FREQUENCY Frequency +#define FEC_INNER FEC_inner +#define SYMBOLRATE SymbolRate +#else #include +#define INVERSION inversion +#define FREQUENCY frequency +#define FEC_INNER fec_inner +#define SYMBOLRATE symbol_rate +#endif #include DEFINE_REF(eDVBSatelliteEquipmentControl); @@ -8,7 +21,7 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl() { } -RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, struct dvb_frontend_parameters &parm, eDVBFrontendParametersSatellite &sat) +RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat) { int hi; eDebug("(very) ugly and hardcoded eDVBSatelliteEquipmentControl"); @@ -19,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); @@ -56,7 +68,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, struct dvb frontend.sendDiseqc(diseqc); frontend.setTone(hi ? iDVBFrontend::toneOn : iDVBFrontend::toneOff); - + return 0; }