git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dont use and show input power measurement (for rotor running detection),
[enigma2.git]
/
lib
/
dvb
/
dvb.cpp
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index 6f72cb1703b1dce919a26cd559384b158c43d212..41c4f3cad4733a1c324589904e46ca142e82049c 100644
(file)
--- a/
lib/dvb/dvb.cpp
+++ b/
lib/dvb/dvb.cpp
@@
-242,8
+242,8
@@
void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
{
if (prev_dvbt_frontend)
{
{
if (prev_dvbt_frontend)
{
- prev_dvbt_frontend->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (
int
)new_fe);
- frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (
int
)&(*prev_dvbt_frontend));
+ prev_dvbt_frontend->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (
long
)new_fe);
+ frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (
long
)&(*prev_dvbt_frontend));
}
prev_dvbt_frontend = new_fe;
}
}
prev_dvbt_frontend = new_fe;
}
@@
-322,7
+322,7
@@
RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend>
// check if another slot linked to this is in use
eDVBRegisteredFrontend *satpos_depends_to_fe =
(eDVBRegisteredFrontend*) i->m_frontend->m_data[eDVBFrontend::SATPOS_DEPENDS_PTR];
// check if another slot linked to this is in use
eDVBRegisteredFrontend *satpos_depends_to_fe =
(eDVBRegisteredFrontend*) i->m_frontend->m_data[eDVBFrontend::SATPOS_DEPENDS_PTR];
- if ( (
int
)satpos_depends_to_fe != -1 )
+ if ( (
long
)satpos_depends_to_fe != -1 )
{
if (satpos_depends_to_fe->m_inuse)
{
{
if (satpos_depends_to_fe->m_inuse)
{
@@
-335,7
+335,7
@@
RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend>
{
eDVBRegisteredFrontend *next =
(eDVBRegisteredFrontend *) i->m_frontend->m_data[eDVBFrontend::LINKED_NEXT_PTR];
{
eDVBRegisteredFrontend *next =
(eDVBRegisteredFrontend *) i->m_frontend->m_data[eDVBFrontend::LINKED_NEXT_PTR];
- while ( (
int
)next != -1 )
+ while ( (
long
)next != -1 )
{
if (next->m_inuse)
{
{
if (next->m_inuse)
{
@@
-347,7
+347,7
@@
RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend>
}
eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)
i->m_frontend->m_data[eDVBFrontend::LINKED_PREV_PTR];
}
eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)
i->m_frontend->m_data[eDVBFrontend::LINKED_PREV_PTR];
- while ( (
int
)prev != -1 )
+ while ( (
long
)prev != -1 )
{
if (prev->m_inuse)
{
{
if (prev->m_inuse)
{
@@
-748,6
+748,15
@@
error:
return ret;
}
return ret;
}
+bool eDVBResourceManager::canMeasureFrontendInputPower()
+{
+ for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
+ {
+ return i->m_frontend->readInputpower() >= 0;
+ }
+ return false;
+}
+
class eDVBChannelFilePush: public eFilePushThread
{
public:
class eDVBChannelFilePush: public eFilePushThread
{
public: