X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fcomponents%2Fscan.h;h=e3bbfc33b15e945847612a9db5831d8192b5cbae;hp=ca64f5e2bc28d0f8dc733cd735bb408bc7893b5f;hb=15428ee271e1af0a7ac52dd004b316164ed23c4d;hpb=dba614edd2aad3c17e244914eaef3809d8300cb1

diff --git a/lib/components/scan.h b/lib/components/scan.h
index ca64f5e..e3bbfc3 100644
--- a/lib/components/scan.h
+++ b/lib/components/scan.h
@@ -2,23 +2,27 @@
 #define __lib_components_scan_h
 
 #include <lib/base/object.h>
+#include <lib/dvb/idvb.h>
 
 class eDVBScan;
 
 class eComponentScan: public Object, public iObject
 {
-DECLARE_REF(eComponentScan);
-private:
+	DECLARE_REF(eComponentScan);
+#ifndef SWIG
 	void scanEvent(int event);
 	ePtr<eConnection> m_scan_event_connection;
 	ePtr<eDVBScan> m_scan;
 	
 	int m_done, m_failed;
+	eSmartPtrList<iDVBFrontendParameters> m_initial;
+#endif
 public:
 	eComponentScan();
 	~eComponentScan();
 	
 	PSignal0<void> statusChanged;
+	PSignal0<void> newService;
 	
 		/* progress between 0 and 100 */
 	int getProgress();
@@ -26,10 +30,26 @@ public:
 		/* get number of services */
 	int getNumServices();
 	
-		/* true when done. */
+		/* true when done or error */
 	int isDone();
 	
-	int start();
+		/* get last added service */
+	void getLastServiceName(std::string &SWIG_OUTPUT);
+	
+	int getError();
+	
+	void clear();
+	void clearAll();
+	void addInitial(const eDVBFrontendParametersSatellite &p);
+	void addInitial(const eDVBFrontendParametersCable &p);
+	void addInitial(const eDVBFrontendParametersTerrestrial &p);
+	
+		/* please keep the flags in sync with lib/dvb/scan.h ! */
+	enum { scanNetworkSearch=1, scanRemoveServices=4, scanDontRemoveFeeds=8, scanDontRemoveUnscanned=16, clearToScanOnFirstNIT = 32, scanOnlyFree = 64 };
+
+	int start(int feid, int flags=0 );
+	SWIG_VOID(RESULT) getFrontend(ePtr<iDVBFrontend> &SWIG_OUTPUT);
+	SWIG_VOID(RESULT) getCurrentTransponder(ePtr<iDVBFrontendParameters> &SWIG_OUTPUT);
 };
 
 #endif