X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/54bd4123728628a6f77bad2584b70d1353a91666..0feaed7d905b121804110148aa33e1ff479088e3:/lib/dvb/scan.h

diff --git a/lib/dvb/scan.h b/lib/dvb/scan.h
index 3556eb20..6abc1d0f 100644
--- a/lib/dvb/scan.h
+++ b/lib/dvb/scan.h
@@ -1,16 +1,16 @@
 #ifndef __lib_dvb_scan_h
 #define __lib_dvb_scan_h
 
-#include <lib/dvb_si/nit.h>
-#include <lib/dvb_si/sdt.h>
-#include <lib/dvb_si/bat.h>
-#include <lib/dvb/isection.h>
+#include <dvbsi++/network_information_section.h>
+#include <dvbsi++/service_description_section.h>
+#include <dvbsi++/bouquet_association_section.h>
+#include <lib/dvb/idemux.h>
 #include <lib/dvb/esection.h>
 #include <lib/dvb/db.h>
 
 class eDVBScan: public Object, public iObject
 {
-DECLARE_REF;
+DECLARE_REF(eDVBScan);
 private:
 		/* chid helper functions: */
 		
@@ -20,7 +20,7 @@ private:
 	eDVBNamespace buildNamespace(eOriginalNetworkID onid, eTransportStreamID tsid, unsigned long hash);
 	
 		/* scan resources */	
-	ePtr<iDVBChannel> m_channel;
+	eUsePtr<iDVBChannel> m_channel;
 	ePtr<iDVBDemux> m_demux;
 	
 		/* infrastructure */
@@ -43,29 +43,31 @@ private:
 	
 	std::list<ePtr<iDVBFrontendParameters> > m_ch_toScan, m_ch_scanned, m_ch_unavailable;
 	ePtr<iDVBFrontendParameters> m_ch_current;
+	eDVBChannelID m_chid_current;
 	
-	ePtr<eTable<ServiceDescriptionTable> > m_SDT;
-	ePtr<eTable<NetworkInformationTable> > m_NIT;
-	ePtr<eTable<BouquetAssociationTable> > m_BAT;
+	ePtr<eTable<ServiceDescriptionSection> > m_SDT;
+	ePtr<eTable<NetworkInformationSection> > m_NIT;
+	ePtr<eTable<BouquetAssociationSection> > 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<void,int> m_event;
-	RESULT processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionTable &sdt);
+	RESULT processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionSection &sdt);
 public:
 	eDVBScan(iDVBChannel *channel);
 	~eDVBScan();
 	
 	void start(const std::list<ePtr<iDVBFrontendParameters> > &known_transponders);
 
-	enum { evtUpdate, evtFinish };
+	enum { evtUpdate, evtFinish, evtFail };
   RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &connection);
 	void insertInto(iDVBChannelList *db);