X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a4cadca93a60d5a5019d2a063e39d66f50e576e2..0b3f18c91718d63aa418d95a81d8464914cd4031:/lib/dvb/frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index abc28d92..0bef95d1 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -14,6 +14,7 @@ class eDVBFrontendParameters: public iDVBFrontendParameters
 	int m_type;
 public:
 	eDVBFrontendParameters();
+	~eDVBFrontendParameters() {}
 	
 	RESULT getSystem(int &type) const;
 	RESULT getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const;
@@ -24,7 +25,7 @@ public:
 	RESULT setDVBC(const eDVBFrontendParametersCable &p);
 	RESULT setDVBT(const eDVBFrontendParametersTerrestrial &p);
 	
-	RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT) const;
+	RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT, bool exact) const;
 	
 	RESULT getHash(unsigned long &SWIG_OUTPUT) const;
 };
@@ -38,9 +39,12 @@ class eDVBFrontend: public iDVBFrontend, public Object
 {
 	DECLARE_REF(eDVBFrontend);
 	int m_type;
-	int m_fe;
+	int m_dvbid;
+	int m_slotid;
 	int m_fd;
+	bool m_need_rotor_workaround;
 	char m_filename[128];
+	char m_description[128];
 #if HAVE_DVB_API_VERSION < 3
 	int m_secfd;
 	char m_sec_filename[128];
@@ -58,9 +62,6 @@ class eDVBFrontend: public iDVBFrontend, public Object
 	eSecCommandList m_sec_sequence;
 
 	enum {
-		NEW_CSW,              // new committed switch cmd
-		NEW_UCSW,             // new uncommitted switch cmd
-		NEW_TONEBURST,        // new toneburst switch cmd
 		CSW,                  // state of the committed switch
 		UCSW,                 // state of the uncommitted switch
 		TONEBURST,            // current state of toneburst switch
@@ -72,6 +73,8 @@ class eDVBFrontend: public iDVBFrontend, public Object
 		LINKED_NEXT_PTR,      // next double linked list (for linked FEs)
 		SATPOS_DEPENDS_PTR,   // pointer to FE with configured rotor (with twin/quattro lnb)
 		FREQ_OFFSET,          // current frequency offset
+		CUR_VOLTAGE,          // current voltage
+		CUR_TONE,             // current continuous tone
 		NUM_DATA_ENTRIES
 	};
 
@@ -82,7 +85,6 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
 	int m_timeoutCount; // needed for timeout
 	int m_retryCount; // diseqc retry for rotor
-	int m_curVoltage;
 
 	void feEvent(int);
 	void timeout();
@@ -90,6 +92,7 @@ class eDVBFrontend: public iDVBFrontend, public Object
 	void setFrontend();
 	int readInputpower();
 	bool setSecSequencePos(int steps);
+	void setRotorData(int pos, int cmd);
 public:
 	eDVBFrontend(int adap, int fe, int &ok);	
 	virtual ~eDVBFrontend();
@@ -110,11 +113,15 @@ public:
 	RESULT getData(int num, int &data);
 	RESULT setData(int num, int val);
 
-	int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, locked, synced
-	PyObject *readTransponderData(bool original);
+	int readFrontendData(int type); // bitErrorRate, signalPower, signalPowerdB, signalQuality, locked, synced
+	void getFrontendStatus(ePyObject dest);
+	void getTransponderData(ePyObject dest, bool original);
+	void getFrontendData(ePyObject dest);
 
 	int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
-	int getID() { return m_fe; }
+	int getDVBID() { return m_dvbid; }
+	int getSlotID() { return m_slotid; }
+	void setSlotInfo(ePyObject obj); // get a tuple (slotid, slotdescr)
 
 	int openFrontend();
 	int closeFrontend();