X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5..5c939afe98208f50aa7442aa7ef8374bec1cc12d:/lib/dvb/scan.cpp diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp index 68121c44..e2bf6215 100644 --- a/lib/dvb/scan.cpp +++ b/lib/dvb/scan.cpp @@ -1,22 +1,32 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include +#include #include -eDVBScan::eDVBScan(iDVBChannel *channel): m_channel(channel) +static bool scan_debug; +#define SCAN_eDebug(x...) do { if (scan_debug) eDebug(x); } while(0) +#define SCAN_eDebugNoNewLine(x...) do { if (scan_debug) eDebugNoNewLine(x); } while(0) + +DEFINE_REF(eDVBScan); + +eDVBScan::eDVBScan(iDVBChannel *channel, bool usePAT, bool debug) + :m_channel(channel), m_channel_state(iDVBChannel::state_idle) + ,m_ready(0), m_ready_all(usePAT ? (readySDT|readyPAT) : readySDT) + ,m_flags(0), m_usePAT(usePAT) { + scan_debug=debug; if (m_channel->getDemux(m_demux)) - eDebug("scan: failed to allocate demux!"); + SCAN_eDebug("scan: failed to allocate demux!"); m_channel->connectStateChange(slot(*this, &eDVBScan::stateChange), m_stateChanged_connection); } @@ -24,29 +34,28 @@ eDVBScan::~eDVBScan() { } -int eDVBScan::isValidONIDTSID(eOriginalNetworkID onid, eTransportStreamID tsid) +int eDVBScan::isValidONIDTSID(int orbital_position, eOriginalNetworkID onid, eTransportStreamID tsid) { switch (onid.get()) { case 0: - case 0xFFFF: case 0x1111: return 0; case 1: - return tsid>1; + return orbital_position == 192; case 0x00B1: return tsid != 0x00B0; case 0x0002: - return tsid != 0x07E8; + return abs(orbital_position-282) < 6; default: - return 1; + return onid.get() < 0xFF00; } } eDVBNamespace eDVBScan::buildNamespace(eOriginalNetworkID onid, eTransportStreamID tsid, unsigned long hash) { // on valid ONIDs, ignore frequency ("sub network") part - if (isValidONIDTSID(onid, tsid)) + if (isValidONIDTSID((hash >> 16) & 0xFFFF, onid, tsid)) hash &= ~0xFFFF; return eDVBNamespace(hash); } @@ -63,39 +72,63 @@ void eDVBScan::stateChange(iDVBChannel *ch) { startFilter(); m_channel_state = state; - } else if (state == iDVBChannel::state_unavailable) + } else if (state == iDVBChannel::state_failed) { m_ch_unavailable.push_back(m_ch_current); nextChannel(); } + /* unavailable will timeout, anyway. */ } RESULT eDVBScan::nextChannel() { ePtr 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; + + /* check what we need */ + m_ready_all = readySDT; + + if (m_flags & scanNetworkSearch) + m_ready_all |= readyNIT; + + if (m_flags & scanSearchBAT) + m_ready_all |= readyBAT; + + if (m_usePAT) + m_ready_all |= readyPAT; - m_ready = readyBAT; if (m_ch_toScan.empty()) { - eDebug("no channels left to scan."); - eDebug("%d channels scanned, %d were unavailable.", + SCAN_eDebug("no channels left to scan."); + SCAN_eDebug("%d channels scanned, %d were unavailable.", m_ch_scanned.size(), m_ch_unavailable.size()); - eDebug("%d channels in database.", m_new_channels.size()); + SCAN_eDebug("%d channels in database.", m_new_channels.size()); m_event(evtFinish); return -ENOENT; } m_ch_current = m_ch_toScan.front(); + m_ch_toScan.pop_front(); if (m_channel->getFrontend(fe)) + { + m_event(evtFail); return -ENOTSUP; - + } + + 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; @@ -103,30 +136,68 @@ RESULT eDVBScan::nextChannel() RESULT eDVBScan::startFilter() { + bool startSDT=true; assert(m_demux); - - m_SDT = new eTable(); - if (m_SDT->start(m_demux, eDVBSDTSpec())) - return -1; - CONNECT(m_SDT->tableReady, eDVBScan::SDTready); - - m_NIT = 0; - m_NIT = new eTable(); - if (m_NIT->start(m_demux, eDVBNITSpec())) - return -1; - CONNECT(m_NIT->tableReady, eDVBScan::NITready); - - m_BAT = new eTable(); - if (m_BAT->start(m_demux, eDVBBATSpec())) - return -1; - CONNECT(m_BAT->tableReady, eDVBScan::BATready); - + + /* only start required filters filter */ + + if (m_ready_all & readyPAT) + startSDT = m_ready & readyPAT; + + m_SDT = 0; + if (startSDT && (m_ready_all & readySDT)) + { + m_SDT = new eTable(); + if (m_ready & readyPAT && m_ready & validPAT) + { + std::vector::const_iterator i = + m_PAT->getSections().begin(); + assert(i != m_PAT->getSections().end()); + int tsid = (*i)->getTableIdExtension(); // in PAT this is the transport stream id + if (m_SDT->start(m_demux, eDVBSDTSpec(tsid, true))) + return -1; + } + else if (m_SDT->start(m_demux, eDVBSDTSpec())) + return -1; + CONNECT(m_SDT->tableReady, eDVBScan::SDTready); + } + + if (!(m_ready & readyPAT)) + { + m_PAT = 0; + if (m_ready_all & readyPAT) + { + m_PAT = new eTable(); + if (m_PAT->start(m_demux, eDVBPATSpec())) + return -1; + CONNECT(m_PAT->tableReady, eDVBScan::PATready); + } + + m_NIT = 0; + if (m_ready_all & readyNIT) + { + m_NIT = new eTable(); + if (m_NIT->start(m_demux, eDVBNITSpec())) + return -1; + CONNECT(m_NIT->tableReady, eDVBScan::NITready); + } + + m_BAT = 0; + if (m_ready_all & readyBAT) + { + m_BAT = new eTable(); + if (m_BAT->start(m_demux, eDVBBATSpec())) + return -1; + CONNECT(m_BAT->tableReady, eDVBScan::BATready); + } + } + return 0; } void eDVBScan::SDTready(int err) { - eDebug("got sdt"); + SCAN_eDebug("got sdt"); m_ready |= readySDT; if (!err) m_ready |= validSDT; @@ -135,7 +206,7 @@ void eDVBScan::SDTready(int err) void eDVBScan::NITready(int err) { - eDebug("got nit, err %d", err); + SCAN_eDebug("got nit, err %d", err); m_ready |= readyNIT; if (!err) m_ready |= validNIT; @@ -144,48 +215,125 @@ void eDVBScan::NITready(int err) void eDVBScan::BATready(int err) { - eDebug("got bat"); + SCAN_eDebug("got bat"); m_ready |= readyBAT; if (!err) m_ready |= validBAT; channelDone(); } -void eDVBScan::addChannel(const eDVBChannelID &chid, iDVBFrontendParameters *feparm) +void eDVBScan::PATready(int err) +{ + SCAN_eDebug("got pat"); + m_ready |= readyPAT; + if (!err) + m_ready |= validPAT; + startFilter(); // for starting the SDT filter +} + +void eDVBScan::addKnownGoodChannel(const eDVBChannelID &chid, iDVBFrontendParameters *feparm) { /* add it to the list of known channels. */ if (chid) m_new_channels.insert(std::pair >(chid, feparm)); - +} + +void eDVBScan::addChannelToScan(const eDVBChannelID &chid, iDVBFrontendParameters *feparm) +{ /* check if we don't already have that channel ... */ - + + int type; + feparm->getSystem(type); + + switch(type) + { + case iDVBFrontend::feSatellite: + { + eDVBFrontendParametersSatellite parm; + feparm->getDVBS(parm); + eDebug("try to add %d %d %d %d %d %d", + parm.orbital_position, parm.frequency, parm.symbol_rate, parm.polarisation, parm.fec, parm.modulation); + break; + } + case iDVBFrontend::feCable: + { + eDVBFrontendParametersCable parm; + feparm->getDVBC(parm); + eDebug("try to add %d %d %d %d", + parm.frequency, parm.symbol_rate, parm.modulation, parm.fec_inner); + break; + } + case iDVBFrontend::feTerrestrial: + { + eDVBFrontendParametersTerrestrial parm; + feparm->getDVBT(parm); + eDebug("try to add %d %d %d %d %d %d %d %d", + parm.frequency, parm.modulation, parm.transmission_mode, parm.hierarchy, + parm.guard_interval, parm.code_rate_LP, parm.code_rate_HP, parm.bandwidth); + break; + } + } + + int found_count=0; /* ... in the list of channels to scan */ - for (std::list >::const_iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end(); ++i) + for (std::list >::iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end();) + { if (sameChannel(*i, feparm)) - return; + { + if (!found_count) + { + *i = feparm; // update + eDebug("update"); + } + else + { + eDebug("remove dupe"); + m_ch_toScan.erase(i++); + continue; + } + ++found_count; + } + ++i; + } + + if (found_count > 0) + { + eDebug("already in todo list"); + return; + } /* ... in the list of successfully scanned channels */ for (std::list >::const_iterator i(m_ch_scanned.begin()); i != m_ch_scanned.end(); ++i) if (sameChannel(*i, feparm)) + { + eDebug("successfully scanned"); return; - + } + /* ... in the list of unavailable channels */ for (std::list >::const_iterator i(m_ch_unavailable.begin()); i != m_ch_unavailable.end(); ++i) - if (sameChannel(*i, feparm)) + if (sameChannel(*i, feparm, true)) + { + eDebug("scanned but not available"); return; + } /* ... on the current channel */ if (sameChannel(m_ch_current, feparm)) + { + eDebug("is current"); return; + } + eDebug("really add"); /* otherwise, add it to the todo list. */ - m_ch_toScan.push_back(feparm); + m_ch_toScan.push_front(feparm); // better.. then the rotor not turning wild from east to west :) } -int eDVBScan::sameChannel(iDVBFrontendParameters *ch1, iDVBFrontendParameters *ch2) const +int eDVBScan::sameChannel(iDVBFrontendParameters *ch1, iDVBFrontendParameters *ch2, bool exact) const { int diff; - if (ch1->calculateDifference(ch2, diff)) + if (ch1->calculateDifference(ch2, diff, exact)) return 0; if (diff < 4000) // more than 4mhz difference? return 1; @@ -197,6 +345,11 @@ void eDVBScan::channelDone() if (m_ready & validSDT) { unsigned long hash = 0; + + // m_ch_current is not set, when eDVBScan is just used for a SDT update + if (!m_ch_current) + m_channel->getCurrentFrontendParameters(m_ch_current); + m_ch_current->getHash(hash); eDVBNamespace dvbnamespace = buildNamespace( @@ -204,8 +357,8 @@ void eDVBScan::channelDone() (**m_SDT->getSections().begin()).getTransportStreamId(), hash); - eDebug("SDT: "); - ServiceDescriptionTableConstIterator i; + SCAN_eDebug("SDT: "); + std::vector::const_iterator i; for (i = m_SDT->getSections().begin(); i != m_SDT->getSections().end(); ++i) processSDT(dvbnamespace, **i); m_ready &= ~validSDT; @@ -213,16 +366,24 @@ void eDVBScan::channelDone() if (m_ready & validNIT) { - eDebug("dumping NIT"); - NetworkInformationTableConstIterator i; + int system; + std::list > m_ch_toScan_backup; + m_ch_current->getSystem(system); + SCAN_eDebug("dumping NIT"); + if (m_flags & clearToScanOnFirstNIT) + { + m_ch_toScan_backup = m_ch_toScan; + m_ch_toScan.clear(); + } + std::vector::const_iterator i; for (i = m_NIT->getSections().begin(); i != m_NIT->getSections().end(); ++i) { - const TransportStreamInfoVector &tsinfovec = *(*i)->getTsInfo(); + const TransportStreamInfoList &tsinfovec = *(*i)->getTsInfo(); for (TransportStreamInfoConstIterator tsinfo(tsinfovec.begin()); tsinfo != tsinfovec.end(); ++tsinfo) { - eDebug("TSID: %04x ONID: %04x", (*tsinfo)->getTransportStreamId(), + SCAN_eDebug("TSID: %04x ONID: %04x", (*tsinfo)->getTransportStreamId(), (*tsinfo)->getOriginalNetworkId()); eOriginalNetworkID onid = (*tsinfo)->getOriginalNetworkId(); @@ -233,68 +394,267 @@ void eDVBScan::channelDone() { switch ((*desc)->getTag()) { -// case SERVICE_LIST_DESCRIPTOR: + case CABLE_DELIVERY_SYSTEM_DESCRIPTOR: + { + if (system != iDVBFrontend::feCable) + break; // when current locked transponder is no cable transponder ignore this descriptor + CableDeliverySystemDescriptor &d = (CableDeliverySystemDescriptor&)**desc; + ePtr feparm = new eDVBFrontendParameters; + eDVBFrontendParametersCable cable; + cable.set(d); + feparm->setDVBC(cable); + + unsigned long hash=0; + feparm->getHash(hash); + eDVBNamespace ns = buildNamespace(onid, tsid, hash); + + addChannelToScan( + eDVBChannelID(ns, tsid, onid), + feparm); + break; + } + case TERRESTRIAL_DELIVERY_SYSTEM_DESCRIPTOR: + { + if (system != iDVBFrontend::feTerrestrial) + break; // when current locked transponder is no terrestrial transponder ignore this descriptor + TerrestrialDeliverySystemDescriptor &d = (TerrestrialDeliverySystemDescriptor&)**desc; + ePtr feparm = new eDVBFrontendParameters; + eDVBFrontendParametersTerrestrial terr; + terr.set(d); + feparm->setDVBT(terr); + + unsigned long hash=0; + feparm->getHash(hash); + eDVBNamespace ns = buildNamespace(onid, tsid, hash); + + addChannelToScan( + eDVBChannelID(ns, tsid, onid), + feparm); + break; + } case SATELLITE_DELIVERY_SYSTEM_DESCRIPTOR: { + if (system != iDVBFrontend::feSatellite) + break; // when current locked transponder is no satellite transponder ignore this descriptor + SatelliteDeliverySystemDescriptor &d = (SatelliteDeliverySystemDescriptor&)**desc; - eDebug("%d kHz, %d%d%d.%d%c %s MOD:%d %d symb/s, fec %d", - d.getFrequency(), - (d.getOrbitalPosition()>>12)&0xF, - (d.getOrbitalPosition()>>8)&0xF, - (d.getOrbitalPosition()>>4)&0xF, - d.getOrbitalPosition()&0xF, d.getWestEastFlag()?'E':'W', - d.getPolarization() ? "hor" : "vert", - d.getModulation(), d.getSymbolRate(), d.getFecInner()); - - /* some sanity checking: below 100MHz is invalid */ if (d.getFrequency() < 10000) break; ePtr feparm = new eDVBFrontendParameters; eDVBFrontendParametersSatellite sat; sat.set(d); + + eDVBFrontendParametersSatellite p; + m_ch_current->getDVBS(p); + + 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); - unsigned long hash=0; - feparm->getHash(hash); - - eDVBNamespace ns = buildNamespace(onid, tsid, hash); - addChannel( - eDVBChannelID(ns, tsid, onid), - feparm); + if ( p.orbital_position != sat.orbital_position) + SCAN_eDebug("dropping this transponder, it's on another satellite."); + else + { + unsigned long hash=0; + feparm->getHash(hash); + addChannelToScan( + eDVBChannelID(buildNamespace(onid, tsid, hash), tsid, onid), + feparm); + } break; } default: - eDebug("descr<%x>", (*desc)->getTag()); + SCAN_eDebug("descr<%x>", (*desc)->getTag()); break; } } - } + } + + /* a pitfall is to have the clearToScanOnFirstNIT-flag set, and having channels which have + no or invalid NIT. this code will not erase the toScan list unless at least one valid entry + has been found. + + This is not a perfect solution, as the channel could contain a partial NIT. Life's bad. + */ + if (m_flags & clearToScanOnFirstNIT) + { + if (m_ch_toScan.empty()) + { + eWarning("clearToScanOnFirstNIT was set, but NIT is invalid. Refusing to stop scan."); + m_ch_toScan = m_ch_toScan_backup; + } else + m_flags &= ~clearToScanOnFirstNIT; + } m_ready &= ~validNIT; } - if ((m_ready & readyAll) != readyAll) + if ((m_ready & m_ready_all) != m_ready_all) return; - eDebug("channel done!"); + SCAN_eDebug("channel done!"); + + /* if we had services on this channel, we declare + this channels as "known good". add it. + + (TODO: not yet implemented) + a NIT entry could have possible overridden + our frontend data with more exact data. + + (TODO: not yet implemented) + the tuning process could have lead to more + exact data than the user entered. + + The channel id was probably corrected + by the data written in the SDT. this is + important, as "initial transponder lists" + usually don't have valid CHIDs (and that's + good). + + These are the reasons for adding the transponder + here, and not before. + */ + + if (!m_chid_current) + eWarning("SCAN: the current channel's ID was not corrected - not adding channel."); + else + addKnownGoodChannel(m_chid_current, m_ch_current); + m_ch_scanned.push_back(m_ch_current); + + for (std::list >::iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end();) + { + if (sameChannel(*i, m_ch_current)) + { + eDebug("remove dupe 2"); + m_ch_toScan.erase(i++); + continue; + } + ++i; + } + nextChannel(); } -void eDVBScan::start(const std::list > &known_transponders) +void eDVBScan::start(const eSmartPtrList &known_transponders, int flags) { + m_flags = flags; m_ch_toScan.clear(); m_ch_scanned.clear(); m_ch_unavailable.clear(); m_new_channels.clear(); m_new_services.clear(); - m_ch_toScan.insert(m_ch_toScan.end(), known_transponders.begin(), known_transponders.end()); + m_last_service = m_new_services.end(); + + for (eSmartPtrList::const_iterator i(known_transponders.begin()); i != known_transponders.end(); ++i) + { + bool exist=false; + for (std::list >::const_iterator ii(m_ch_toScan.begin()); ii != m_ch_toScan.end(); ++ii) + { + if (sameChannel(*i, *ii, true)) + { + exist=true; + break; + } + } + if (!exist) + m_ch_toScan.push_back(*i); + } + nextChannel(); } -void eDVBScan::insertInto(eDVBDB *db) +void eDVBScan::insertInto(iDVBChannelList *db, bool dontRemoveOldFlags) { + if (m_flags & scanRemoveServices) + { + bool clearTerrestrial=false; + bool clearCable=false; + std::set scanned_sat_positions; + + std::list >::iterator it(m_ch_scanned.begin()); + for (;it != m_ch_scanned.end(); ++it) + { + int system; + (*it)->getSystem(system); + switch(system) + { + case iDVBFrontend::feSatellite: + { + eDVBFrontendParametersSatellite sat_parm; + (*it)->getDVBS(sat_parm); + scanned_sat_positions.insert(sat_parm.orbital_position); + break; + } + case iDVBFrontend::feTerrestrial: + { + clearTerrestrial=true; + break; + } + case iDVBFrontend::feCable: + { + clearCable=true; + break; + } + } + } + + for (it=m_ch_unavailable.begin();it != m_ch_unavailable.end(); ++it) + { + int system; + (*it)->getSystem(system); + switch(system) + { + case iDVBFrontend::feSatellite: + { + eDVBFrontendParametersSatellite sat_parm; + (*it)->getDVBS(sat_parm); + scanned_sat_positions.insert(sat_parm.orbital_position); + break; + } + case iDVBFrontend::feTerrestrial: + { + clearTerrestrial=true; + break; + } + case iDVBFrontend::feCable: + { + clearCable=true; + break; + } + } + } + + if (clearTerrestrial) + { + eDVBChannelID chid; + chid.dvbnamespace=0xEEEE0000; + db->removeServices(chid); + } + if (clearCable) + { + eDVBChannelID chid; + chid.dvbnamespace=0xFFFF0000; + db->removeServices(chid); + } + for (std::set::iterator x(scanned_sat_positions.begin()); x != scanned_sat_positions.end(); ++x) + { + eDVBChannelID chid; + if (m_flags & scanDontRemoveFeeds) + chid.dvbnamespace = eDVBNamespace((*x)<<16); +// eDebug("remove %d %08x", *x, chid.dvbnamespace.get()); + db->removeServices(chid, *x); + } + } + for (std::map >::const_iterator ch(m_new_channels.begin()); ch != m_new_channels.end(); ++ch) db->addChannelToList(ch->first, ch->second); @@ -303,21 +663,41 @@ void eDVBScan::insertInto(eDVBDB *db) { ePtr dvb_service; if (!db->getService(service->first, dvb_service)) - *dvb_service = *service->second; + { + if (dvb_service->m_flags & eDVBService::dxNoSDT) + continue; + if (!(dvb_service->m_flags & eDVBService::dxHoldName)) + { + dvb_service->m_service_name = service->second->m_service_name; + dvb_service->m_service_name_sort = service->second->m_service_name_sort; + } + dvb_service->m_provider_name = service->second->m_provider_name; + if (service->second->m_ca.size()) + dvb_service->m_ca = service->second->m_ca; + if (!dontRemoveOldFlags) // do not remove new found flags when not wished + dvb_service->m_flags &= ~eDVBService::dxNewFound; + } else + { db->addService(service->first, service->second); + if (!(m_flags & scanRemoveServices)) + service->second->m_flags |= eDVBService::dxNewFound; + } } } -RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionTable &sdt) +RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionSection &sdt) { - const ServiceDescriptionVector &services = *sdt.getDescriptions(); - eDebug("ONID: %04x", sdt.getOriginalNetworkId()); + const ServiceDescriptionList &services = *sdt.getDescriptions(); + SCAN_eDebug("ONID: %04x", sdt.getOriginalNetworkId()); eDVBChannelID chid(dvbnamespace, sdt.getTransportStreamId(), sdt.getOriginalNetworkId()); + /* save correct CHID for this channel */ + m_chid_current = chid; + for (ServiceDescriptionConstIterator s(services.begin()); s != services.end(); ++s) { - eDebugNoNewLine("SID %04x: ", (*s)->getServiceId()); + SCAN_eDebugNoNewLine("SID %04x: ", (*s)->getServiceId()); eServiceReferenceDVB ref; ePtr service = new eDVBService; @@ -338,37 +718,60 @@ RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescription case SERVICE_DESCRIPTOR: { ServiceDescriptor &d = (ServiceDescriptor&)**desc; - eDebug("name '%s', provider_name '%s'", d.getServiceName().c_str(), d.getServiceProviderName().c_str()); - service->m_service_name = d.getServiceName(); - service->m_provider_name = d.getServiceProviderName(); + service->m_service_name = convertDVBUTF8(d.getServiceName()); + service->genSortName(); + + service->m_provider_name = convertDVBUTF8(d.getServiceProviderName()); + SCAN_eDebug("name '%s', provider_name '%s'", service->m_service_name.c_str(), service->m_provider_name.c_str()); break; } case CA_IDENTIFIER_DESCRIPTOR: { CaIdentifierDescriptor &d = (CaIdentifierDescriptor&)**desc; - const CaSystemIdVector &caids = *d.getCaSystemIds(); - eDebugNoNewLine("CA "); - for (CaSystemIdVector::const_iterator i(caids.begin()); i != caids.end(); ++i) + const CaSystemIdList &caids = *d.getCaSystemIds(); + SCAN_eDebugNoNewLine("CA "); + for (CaSystemIdList::const_iterator i(caids.begin()); i != caids.end(); ++i) { - eDebugNoNewLine("%04x ", *i); - service->m_ca.insert(*i); + SCAN_eDebugNoNewLine("%04x ", *i); + service->m_ca.push_front(*i); } - eDebug(""); + SCAN_eDebug(""); break; } default: - eDebug("descr<%x>", (*desc)->getTag()); + SCAN_eDebug("descr<%x>", (*desc)->getTag()); break; } } - m_new_services.insert(std::pair >(ref, service)); + std::pair >::iterator, bool> i = m_new_services.insert(std::pair >(ref, service)); + + if (i.second) + { + m_last_service = i.first; + m_event(evtNewService); + } } return 0; } RESULT eDVBScan::connectEvent(const Slot1 &event, ePtr &connection) { - connection = new eConnection(m_event.connect(event)); + connection = new eConnection(this, m_event.connect(event)); return 0; } + +void eDVBScan::getStats(int &transponders_done, int &transponders_total, int &services) +{ + transponders_done = m_ch_scanned.size() + m_ch_unavailable.size(); + transponders_total = m_ch_toScan.size() + transponders_done; + services = m_new_services.size(); +} + +void eDVBScan::getLastServiceName(std::string &last_service_name) +{ + if (m_last_service == m_new_services.end()) + last_service_name = ""; + else + last_service_name = m_last_service->second->m_service_name; +}