add return code

[enigma2.git] / lib / dvb / scan.h

diff --git a/lib/dvb/scan.h b/lib/dvb/scan.h
index bfd3add99d88aabd1df9311c605bedb541728a9b..6abc1d0f49be9d4201091c49e060823b1d351c4f 100644 (file)
--- 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>
@@ -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,22 +43,24 @@ 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();