{
ePtr<iDVBFrontend> fe;
- m_SDT = 0; m_BAT = 0; m_NIT = 0;
+ m_SDT = 0; m_PAT = 0; m_BAT = 0; m_NIT = 0;
m_ready = 0;
m_chid_current = eDVBChannelID();
m_channel_state = iDVBChannel::state_idle;
+
if (fe->tune(*m_ch_current))
- {
return nextChannel();
- m_event(evtFail);
- return -EINVAL;
- }
-
+
m_event(evtUpdate);
return 0;
}
ePtr<eDVBFrontendParameters> feparm = new eDVBFrontendParameters;
eDVBFrontendParametersSatellite sat;
sat.set(d);
- feparm->setDVBS(sat);
eDVBFrontendParametersSatellite p;
m_ch_current->getDVBS(p);
- if ( p.orbital_position != sat.orbital_position )
+ if ( abs(p.orbital_position - sat.orbital_position) < 5 )
+ sat.orbital_position = p.orbital_position;
+
+ if ( abs(abs(3600 - p.orbital_position) - sat.orbital_position) < 5 )
+ {
+ eDebug("found transponder with incorrect west/east flag ... correct this");
+ sat.orbital_position = p.orbital_position;
+ }
+
+ feparm->setDVBS(sat);
+
+ if ( p.orbital_position != sat.orbital_position)
SCAN_eDebug("dropping this transponder, it's on another satellite.");
else
{
else
{
db->addService(service->first, service->second);
- service->second->m_flags |= eDVBService::dxNewFound;
+ if (!(m_flags & scanRemoveServices))
+ service->second->m_flags |= eDVBService::dxNewFound;
}
}
}
else
last_service_name = m_last_service->second->m_service_name;
}
+
+RESULT eDVBScan::getFrontend(ePtr<iDVBFrontend> &fe)
+{
+ if (m_channel)
+ return m_channel->getFrontend(fe);
+ fe = 0;
+ return -1;
+}
+
+RESULT eDVBScan::getCurrentTransponder(ePtr<iDVBFrontendParameters> &tp)
+{
+ if (m_ch_current)
+ {
+ tp = m_ch_current;
+ return 0;
+ }
+ tp = 0;
+ return -1;
+}