X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/256711935ca5934a9e1a8c0d7b103aa46801e3cf..37b38cb05fc6bc4993f852a78bdba93c7627cf5b:/lib/dvb/frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 9d9aab71..06ed12cc 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -13,6 +13,7 @@ class eDVBFrontendParameters: public iDVBFrontendParameters
 		eDVBFrontendParametersTerrestrial terrestrial;
 	};
 	int m_type;
+	int m_flags;
 public:
 	eDVBFrontendParameters();
 	~eDVBFrontendParameters()
@@ -32,6 +33,9 @@ public:
 
 	RESULT getHash(unsigned long &) const;
 	RESULT calcLockTimeout(unsigned int &) const;
+
+	RESULT getFlags(unsigned int &flags) const { flags = m_flags; return 0; }
+	RESULT setFlags(unsigned int flags) { m_flags = flags; return 0; }
 };
 
 #ifndef SWIG
@@ -43,6 +47,9 @@ class eDVBFrontend: public iDVBFrontend, public Object
 {
 public:
 	enum {
+		NEW_CSW,
+		NEW_UCSW,
+		NEW_TONEBURST,
 		CSW,                  // state of the committed switch
 		UCSW,                 // state of the uncommitted switch
 		TONEBURST,            // current state of toneburst switch
@@ -61,6 +68,7 @@ public:
 	Signal1<void,iDVBFrontend*> m_stateChanged;
 private:
 	DECLARE_REF(eDVBFrontend);
+	bool m_simulate;
 	bool m_enabled;
 	int m_type;
 	int m_dvbid;
@@ -77,10 +85,9 @@ private:
 	FRONTENDPARAMETERS parm;
 	int m_state;
 	ePtr<iDVBSatelliteEquipmentControl> m_sec;
-	eSocketNotifier *m_sn;
+	ePtr<eSocketNotifier> m_sn;
 	int m_tuning;
-	eTimer *m_timeout;
-	eTimer *m_tuneTimer;
+	ePtr<eTimer> m_timeout, m_tuneTimer;
 
 	eSecCommandList m_sec_sequence;
 
@@ -97,10 +104,9 @@ private:
 	void tuneLoop();  // called by m_tuneTimer
 	void setFrontend();
 	bool setSecSequencePos(int steps);
-	void setRotorData(int pos, int cmd);
 	static int PriorityOrder;
 public:
-	eDVBFrontend(int adap, int fe, int &ok);	
+	eDVBFrontend(int adap, int fe, int &ok, bool simulate=false);
 	virtual ~eDVBFrontend();
 
 	int readInputpower();
@@ -133,8 +139,9 @@ public:
 	static int getTypePriorityOrder() { return PriorityOrder; }
 
 	int openFrontend();
-	int closeFrontend();
+	int closeFrontend(bool force=false);
 	const char *getDescription() const { return m_description; }
+	bool is_simulate() const { return m_simulate; }
 };
 
 #endif // SWIG