git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change order from pcr,video,audio to video,pcr,audio
[enigma2.git]
/
lib
/
dvb
/
frontend.cpp
diff --git
a/lib/dvb/frontend.cpp
b/lib/dvb/frontend.cpp
index c1dce2d9372d7b9a10058a7fd7a58684c3aca3d3..a05963cd2bd892df8fc173edbfb3ba8a39cb73d6 100644
(file)
--- a/
lib/dvb/frontend.cpp
+++ b/
lib/dvb/frontend.cpp
@@
-288,7
+288,9
@@
eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok): m_type(-1), m_fe(fe), m_c
m_tuneTimer = new eTimer(eApp);
CONNECT(m_tuneTimer->timeout, eDVBFrontend::tuneLoop);
m_tuneTimer = new eTimer(eApp);
CONNECT(m_tuneTimer->timeout, eDVBFrontend::tuneLoop);
- memset(m_data, 0xFFFF, sizeof(m_data));
+ int entries = sizeof(m_data) / sizeof(int);
+ for (int i=0; i<entries; ++i)
+ m_data[i] = -1;
return;
}
return;
}
@@
-656,8
+658,6
@@
RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
parm.frequency = feparm.frequency * 1000;
parm.u.qam.symbol_rate = feparm.symbol_rate;
#endif
parm.frequency = feparm.frequency * 1000;
parm.u.qam.symbol_rate = feparm.symbol_rate;
#endif
-
-
fe_modulation_t mod;
switch (feparm.modulation)
{
fe_modulation_t mod;
switch (feparm.modulation)
{
@@
-685,7
+685,6
@@
RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
#else
parm.u.qam.modulation = mod;
#endif
#else
parm.u.qam.modulation = mod;
#endif
-
switch (feparm.inversion)
{
case eDVBFrontendParametersCable::Inversion::On:
switch (feparm.inversion)
{
case eDVBFrontendParametersCable::Inversion::On:
@@
-998,7
+997,7
@@
RESULT eDVBFrontend::setSecSequence(const eSecCommandList &list)
RESULT eDVBFrontend::getData(int num, int &data)
{
RESULT eDVBFrontend::getData(int num, int &data)
{
- if ( num <
7
)
+ if ( num <
(int)(sizeof(m_data)/sizeof(int))
)
{
data = m_data[num];
return 0;
{
data = m_data[num];
return 0;
@@
-1008,7
+1007,7
@@
RESULT eDVBFrontend::getData(int num, int &data)
RESULT eDVBFrontend::setData(int num, int val)
{
RESULT eDVBFrontend::setData(int num, int val)
{
- if ( num <
7
)
+ if ( num <
(int)(sizeof(m_data)/sizeof(int))
)
{
m_data[num] = val;
return 0;
{
m_data[num] = val;
return 0;
@@
-1018,14
+1017,16
@@
RESULT eDVBFrontend::setData(int num, int val)
int eDVBFrontend::isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)
{
int eDVBFrontend::isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)
{
- if (m_type != eDVBFrontend::feSatellite)
- return 1;
-
- ASSERT(m_sec);
-
- eDVBFrontendParametersSatellite sat_parm;
-
- ASSERT(!feparm->getDVBS(sat_parm));
+ int type;
+ if (feparm->getSystem(type) || type != m_type)
+ return 0;
- return m_sec->canTune(sat_parm, this, 1 << m_fe);
+ if (m_type == eDVBFrontend::feSatellite)
+ {
+ ASSERT(m_sec);
+ eDVBFrontendParametersSatellite sat_parm;
+ ASSERT(!feparm->getDVBS(sat_parm));
+ return m_sec->canTune(sat_parm, this, 1 << m_fe);
+ }
+ return 1;
}
}