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

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index abc28d92..cfe25d1a 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;
 };
@@ -58,9 +59,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 +70,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 +82,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();
@@ -111,7 +110,9 @@ public:
 	RESULT setData(int num, int val);
 
 	int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, locked, synced
-	PyObject *readTransponderData(bool original);
+	void getFrontendStatus(ePyObject dest);
+	void getTransponderData(ePyObject dest, bool original);
+	void getFrontendData(ePyObject dest);
 
 	int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
 	int getID() { return m_fe; }