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 linking tuners
[enigma2.git]
/
lib
/
dvb
/
sec.cpp
diff --git
a/lib/dvb/sec.cpp
b/lib/dvb/sec.cpp
index 10b362ab1a87dded4a8c4a1c1808eff0a0d79bd2..5c0601adb111fc8e4c8ac6f7556cb41cae64aade 100644
(file)
--- a/
lib/dvb/sec.cpp
+++ b/
lib/dvb/sec.cpp
@@
-849,7
+849,7
@@
RESULT eDVBSatelliteEquipmentControl::addLNB()
eDebug("no more LNB free... cnt is %d", m_lnbidx);
return -ENOSPC;
}
eDebug("no more LNB free... cnt is %d", m_lnbidx);
return -ENOSPC;
}
- eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx
-1
);
+ eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx);
return 0;
}
return 0;
}
@@
-1260,12
+1260,11
@@
RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
{
eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
{
eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
- int cnt=0;
- for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+ for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
{
{
- if (
cnt
== tu1)
+ if (
it->m_frontend->getSlotID()
== tu1)
p1 = *it;
p1 = *it;
- else if (
cnt
== tu2)
+ else if (
it->m_frontend->getSlotID()
== tu2)
p2 = *it;
}
if (p1 && p2)
p2 = *it;
}
if (p1 && p2)
@@
-1297,12
+1296,11
@@
RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2)
eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
- int cnt=0;
- for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+ for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
{
{
- if (
cnt
== tu1)
+ if (
it->m_frontend->getSlotID()
== tu1)
p1 = *it;
p1 = *it;
- else if (
cnt
== tu2)
+ else if (
it->m_frontend->getSlotID()
== tu2)
p2 = *it;
}
if (p1 && p2)
p2 = *it;
}
if (p1 && p2)