X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/dba614edd2aad3c17e244914eaef3809d8300cb1..2e2cf81de863a180f7d27dca89e5122e1eb0acaa:/lib/dvb/scan.h diff --git a/lib/dvb/scan.h b/lib/dvb/scan.h index 2f75291b..6abc1d0f 100644 --- a/lib/dvb/scan.h +++ b/lib/dvb/scan.h @@ -1,10 +1,10 @@ #ifndef __lib_dvb_scan_h #define __lib_dvb_scan_h -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -20,7 +20,7 @@ private: eDVBNamespace buildNamespace(eOriginalNetworkID onid, eTransportStreamID tsid, unsigned long hash); /* scan resources */ - ePtr m_channel; + eUsePtr m_channel; ePtr m_demux; /* infrastructure */ @@ -43,22 +43,24 @@ private: std::list > m_ch_toScan, m_ch_scanned, m_ch_unavailable; ePtr m_ch_current; + eDVBChannelID m_chid_current; - ePtr > m_SDT; - ePtr > m_NIT; - ePtr > m_BAT; + ePtr > m_SDT; + ePtr > m_NIT; + ePtr > m_BAT; void SDTready(int err); void NITready(int err); void BATready(int err); - void addChannel(const eDVBChannelID &chid, iDVBFrontendParameters *feparm); + void addKnownGoodChannel(const eDVBChannelID &chid, iDVBFrontendParameters *feparm); + void addChannelToScan(const eDVBChannelID &chid, iDVBFrontendParameters *feparm); int sameChannel(iDVBFrontendParameters *ch1, iDVBFrontendParameters *ch2) const; void channelDone(); Signal1 m_event; - RESULT processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionTable &sdt); + RESULT processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionSection &sdt); public: eDVBScan(iDVBChannel *channel); ~eDVBScan();