X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1995abf236d34dd3264435a35f2c9c128cf3afaa..0980594e3037839b361eae71646ccf960aaa2659:/lib/dvb/frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index eb91eb72..41de874b 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -2,6 +2,7 @@
 #define __dvb_frontend_h
 
 #include <lib/dvb/idvb.h>
+
 class eDVBFrontendParameters: public iDVBFrontendParameters
 {
 	DECLARE_REF(eDVBFrontendParameters);
@@ -14,20 +15,22 @@ class eDVBFrontendParameters: public iDVBFrontendParameters
 	int m_type;
 public:
 	eDVBFrontendParameters();
-	~eDVBFrontendParameters() {}
-	
+	~eDVBFrontendParameters()
+	{
+	}
+
 	RESULT getSystem(int &type) const;
-	RESULT getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const;
-	RESULT getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const;
-	RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const;
+	RESULT getDVBS(eDVBFrontendParametersSatellite &) const;
+	RESULT getDVBC(eDVBFrontendParametersCable &) const;
+	RESULT getDVBT(eDVBFrontendParametersTerrestrial &) const;
 
 	RESULT setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune=false);
 	RESULT setDVBC(const eDVBFrontendParametersCable &p);
 	RESULT setDVBT(const eDVBFrontendParametersTerrestrial &p);
-	
-	RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT, bool exact) const;
-	
-	RESULT getHash(unsigned long &SWIG_OUTPUT) const;
+
+	RESULT calculateDifference(const iDVBFrontendParameters *parm, int &, bool exact) const;
+
+	RESULT getHash(unsigned long &) const;
 };
 
 #ifndef SWIG
@@ -38,10 +41,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];
@@ -89,6 +96,8 @@ class eDVBFrontend: public iDVBFrontend, public Object
 	void setFrontend();
 	int readInputpower();
 	bool setSecSequencePos(int steps);
+	void setRotorData(int pos, int cmd);
+	static int PriorityOrder;
 public:
 	eDVBFrontend(int adap, int fe, int &ok);	
 	virtual ~eDVBFrontend();
@@ -109,13 +118,17 @@ public:
 	RESULT getData(int num, int &data);
 	RESULT setData(int num, int val);
 
-	int readFrontendData(int type); // bitErrorRate, signalPower, signalPowerdB, signalQuality, locked, synced
+	int readFrontendData(int type); // bitErrorRate, signalPower, signalQualitydB, 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)
+	static void setTypePriorityOrder(int val) { PriorityOrder = val; }
+	static int getTypePriorityOrder() { return PriorityOrder; }
 
 	int openFrontend();
 	int closeFrontend();