X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/68954b49798e996808161796f1b42a1ae1ac487b..5c939afe98208f50aa7442aa7ef8374bec1cc12d:/lib/dvb/frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 78011276..6bf36466 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -38,10 +38,14 @@ class eSecCommandList;
 class eDVBFrontend: public iDVBFrontend, public Object
 {
 	DECLARE_REF(eDVBFrontend);
+	bool m_enabled;
 	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];
@@ -70,6 +74,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
 	};
 
@@ -80,7 +86,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();
@@ -88,6 +93,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();
@@ -108,11 +114,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; }
+	bool setSlotInfo(ePyObject obj); // get a tuple (slotid, slotdescr)
 
 	int openFrontend();
 	int closeFrontend();