after DECLARE_REF now all is private.. not public

[vuplus_dvbapp] / lib / dvb / scan.h

diff --git a/lib/dvb/scan.h b/lib/dvb/scan.h
index 0f32d67..68e21a5 100644 (file)
--- a/lib/dvb/scan.h
+++ b/lib/dvb/scan.h
@@ -11,8 +11,7 @@
 
 class eDVBScan: public Object, public iObject
 {
-DECLARE_REF(eDVBScan);
-private:
+       DECLARE_REF(eDVBScan);
                /* chid helper functions: */
                
                /* heuristically determine if onid/tsid is valid */
@@ -59,8 +58,9 @@ private:
                
        void addKnownGoodChannel(const eDVBChannelID &chid, iDVBFrontendParameters *feparm);
        void addChannelToScan(const eDVBChannelID &chid, iDVBFrontendParameters *feparm);
-       int  sameChannel(iDVBFrontendParameters *ch1, iDVBFrontendParameters *ch2) const;
-       
+
+       int sameChannel(iDVBFrontendParameters *ch1, iDVBFrontendParameters *ch2, bool exact=false) const;
+
        void channelDone();
        
        Signal1<void,int> m_event;
@@ -72,7 +72,11 @@ public:
        eDVBScan(iDVBChannel *channel, bool usePAT=true, bool debug=true );
        ~eDVBScan();
 
-       enum { scanNetworkSearch = 1, scanSearchBAT = 2, scanRemoveServices = 4, scanDontRemoveFeeds=8 };
+       enum {
+               scanNetworkSearch = 1, scanSearchBAT = 2,
+               scanRemoveServices = 4, scanDontRemoveFeeds = 8,
+               clearToScanOnFirstNIT = 16 };
+
        void start(const eSmartPtrList<iDVBFrontendParameters> &known_transponders, int flags);
 
        enum { evtUpdate, evtNewService, evtFinish, evtFail };
@@ -81,6 +85,8 @@ public:
        
        void getStats(int &transponders_done, int &transponders_total, int &services);
        void getLastServiceName(std::string &name);
+       RESULT getFrontend(ePtr<iDVBFrontend> &);
+       RESULT getCurrentTransponder(ePtr<iDVBFrontendParameters> &);
 };
 
 #endif