git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finish dvb-s2 fec stuff
[enigma2.git]
/
lib
/
dvb
/
sec.cpp
diff --git
a/lib/dvb/sec.cpp
b/lib/dvb/sec.cpp
index 2a35ba148f7f6f432c58c91ddbff469505bf6b37..70c742a2e6d56c62d50853055ad63e777096c06c 100644
(file)
--- a/
lib/dvb/sec.cpp
+++ b/
lib/dvb/sec.cpp
@@
-1113,6
+1113,7
@@
PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int t
else if (cnt == tu2)
p2 = *it;
}
else if (cnt == tu2)
p2 = *it;
}
+
if (p1 && p2)
{
// check for linked tuners
if (p1 && p2)
{
// check for linked tuners
@@
-1145,10
+1146,12
@@
PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int t
int tmp2=-1;
// check for rotor dependency
p1->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp1);
int tmp2=-1;
// check for rotor dependency
p1->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp1);
+ if (tmp1 != -1)
+ p1 = (eDVBRegisteredFrontend*)tmp1;
p2->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp2);
p2->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp2);
- if (tmp
1 != -1 && (void*)tmp1 != p2
- && tmp2 != -1 && (void*)tmp2 != p1
-
&& tmp1 != tmp2
)
+ if (tmp
2 != -1)
+ p2 = (eDVBRegisteredFrontend*)tmp2;
+
if (p1 != p2
)
{
int tu1_mask = 1 << p1->m_frontend->getID(),
tu2_mask = 1 << p2->m_frontend->getID();
{
int tu1_mask = 1 << p1->m_frontend->getID(),
tu2_mask = 1 << p2->m_frontend->getID();