git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix build with old api
[enigma2.git]
/
lib
/
dvb
/
sec.cpp
diff --git
a/lib/dvb/sec.cpp
b/lib/dvb/sec.cpp
index c033266a6d8b744b1dcafe42f7fda630d73d785f..1555090cb0a321acf4c9e5c13e7f7c00bb4ba856 100644
(file)
--- a/
lib/dvb/sec.cpp
+++ b/
lib/dvb/sec.cpp
@@
-1,5
+1,18
@@
+#include <config.h>
#include <lib/dvb/sec.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>
#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);
#include <lib/base/eerror.h>
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");
{
int hi;
eDebug("(very) ugly and hardcoded eDVBSatelliteEquipmentControl");
@@
-19,24
+32,23
@@
RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, struct dvb
hi = 0;
if (hi)
hi = 0;
if (hi)
- parm.
frequency
= sat.frequency - 10600000;
+ parm.
FREQUENCY
= sat.frequency - 10600000;
else
else
- parm.
frequency
= sat.frequency - 9750000;
+ parm.
FREQUENCY
= sat.frequency - 9750000;
// frontend.sentDiseqc(...);
// 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:
switch (sat.fec)
{
// case 1:
// case ...:
default:
- parm.u.qpsk.
fec_inner
= FEC_AUTO;
+ parm.u.qpsk.
FEC_INNER
= FEC_AUTO;
break;
}
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);
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);
frontend.sendDiseqc(diseqc);
frontend.setTone(hi ? iDVBFrontend::toneOn : iDVBFrontend::toneOff);
-
+
return 0;
}
return 0;
}