git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
parsing for /etc/timezone.xml added
[enigma2.git]
/
lib
/
dvb
/
frontend.cpp
diff --git
a/lib/dvb/frontend.cpp
b/lib/dvb/frontend.cpp
index 79b56e1e6b8ca588c08e700d22c4f0a3d0b6b284..13ae473b89750a7e9ecf4b4aeba5f3b40543456c 100644
(file)
--- a/
lib/dvb/frontend.cpp
+++ b/
lib/dvb/frontend.cpp
@@
-633,7
+633,7
@@
RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
return -ENOENT;
}
return -ENOENT;
}
- res = m_sec->prepare(*this, parm, feparm);
+ res = m_sec->prepare(*this, parm, feparm
, m_fe ? 1 << m_fe : 1
);
if (res)
return res;
#if HAVE_DVB_API_VERSION < 3
if (res)
return res;
#if HAVE_DVB_API_VERSION < 3
@@
-908,7
+908,16
@@
RESULT eDVBFrontend::setData(int num, int val)
return -EINVAL;
}
return -EINVAL;
}
-int eDVBFrontend::isCompatibleWith(
const eDVBChannelID &chid
)
+int eDVBFrontend::isCompatibleWith(
ePtr<iDVBFrontendParameters> &feparm
)
{
{
- return 1;
+ if (m_type != eDVBFrontend::feSatellite)
+ return 1;
+
+ ASSERT(m_sec);
+
+ eDVBFrontendParametersSatellite sat_parm;
+
+ ASSERT(!feparm->getDVBS(sat_parm));
+
+ return m_sec->canTune(sat_parm, this, m_fe ? 1 << m_fe : 1);
}
}