X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/865b494130c35c6bda653b196fdbc61890ea76b5..b0e09a2cd9a05a002222d79fb71848f4c7820ff3:/lib/dvb/scan.h

diff --git a/lib/dvb/scan.h b/lib/dvb/scan.h
index 743ea8d9..df832bd6 100644
--- a/lib/dvb/scan.h
+++ b/lib/dvb/scan.h
@@ -1,9 +1,9 @@
 #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 <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>
@@ -31,12 +31,12 @@ private:
 	RESULT nextChannel();
 	
 	RESULT startFilter();	
-	enum { readySDT=1, readyNIT=2, readyBAT=4, readyAll=7,
+	enum { readySDT=1, readyNIT=2, readyBAT=4,
 	       validSDT=8, validNIT=16, validBAT=32};
 
 		/* scan state variables */
 	int m_channel_state;
-	int m_ready;
+	int m_ready, m_ready_all;
 	
 	std::map<eDVBChannelID, ePtr<iDVBFrontendParameters> > m_new_channels;
 	std::map<eServiceReferenceDVB, ePtr<eDVBService> > m_new_services;
@@ -45,9 +45,9 @@ private:
 	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);
@@ -60,12 +60,15 @@ private:
 	void channelDone();
 	
 	Signal1<void,int> m_event;
-	RESULT processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionTable &sdt);
+	RESULT processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionSection &sdt);
+	
+	int m_flags;
 public:
 	eDVBScan(iDVBChannel *channel);
 	~eDVBScan();
 	
-	void start(const std::list<ePtr<iDVBFrontendParameters> > &known_transponders);
+	enum { scanNetworkSearch = 1, scanSearchBAT = 2 };
+	void start(const eSmartPtrList<iDVBFrontendParameters> &known_transponders, int flags);
 
 	enum { evtUpdate, evtFinish, evtFail };
   RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &connection);