X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/68794a76cf18bbf9fd6970bdce4e5074896129c7..5782eaf8b54f08604b5002a94b67708656cdca74:/lib/dvb/frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 6bf36466..ac681bbe 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,23 @@ 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;
+	RESULT calcLockTimeout(unsigned int &) const;
 };
 
 #ifndef SWIG
@@ -79,7 +83,7 @@ class eDVBFrontend: public iDVBFrontend, public Object
 		NUM_DATA_ENTRIES
 	};
 
-	int m_data[NUM_DATA_ENTRIES];
+	long m_data[NUM_DATA_ENTRIES];
 
 	int m_idleInputpower[2];  // 13V .. 18V
 	int m_runningInputpower;
@@ -94,13 +98,14 @@ class eDVBFrontend: public iDVBFrontend, public Object
 	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();
 
 	RESULT getFrontendType(int &type);
 	RESULT tune(const iDVBFrontendParameters &where);
-	RESULT prepare_sat(const eDVBFrontendParametersSatellite &);
+	RESULT prepare_sat(const eDVBFrontendParametersSatellite &, unsigned int timeout);
 	RESULT prepare_cable(const eDVBFrontendParametersCable &);
 	RESULT prepare_terrestrial(const eDVBFrontendParametersTerrestrial &);
 	RESULT connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection);
@@ -111,10 +116,10 @@ public:
 	RESULT sendToneburst(int burst);
 	RESULT setSEC(iDVBSatelliteEquipmentControl *sec);
 	RESULT setSecSequence(const eSecCommandList &list);
-	RESULT getData(int num, int &data);
-	RESULT setData(int num, int val);
+	RESULT getData(int num, long &data);
+	RESULT setData(int num, long 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);
@@ -123,9 +128,12 @@ public:
 	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();
+	const char *getDescription() const { return m_description; }
 };
 
 #endif // SWIG