X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Ffrontend.h;h=5821e54da3efca6dd84b692a4401e5f7a132e11e;hp=c091227bfbd844a78ffe594760bfe72b4a672d98;hb=99e6feec1546d5fa2ff8e5cdfdf84438db4281b3;hpb=0ecfa70938499a3386c282577e28625d04d4626b

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index c091227..5821e54 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -1,11 +1,7 @@
 #ifndef __dvb_frontend_h
 #define __dvb_frontend_h
 
-#include <config.h>
 #include <lib/dvb/idvb.h>
-#include <lib/dvb/sec.h>
-
-class eSecCommandList;
 
 class eDVBFrontendParameters: public iDVBFrontendParameters
 {
@@ -19,29 +15,45 @@ class eDVBFrontendParameters: public iDVBFrontendParameters
 	int m_type;
 public:
 	eDVBFrontendParameters();
-	
+	~eDVBFrontendParameters()
+	{
+	}
+
 	RESULT getSystem(int &type) const;
-	RESULT getDVBS(eDVBFrontendParametersSatellite &p) const;
-	RESULT getDVBC(eDVBFrontendParametersCable &p) const;
-	RESULT getDVBT(eDVBFrontendParametersTerrestrial &p) const;
-
-	RESULT setDVBS(eDVBFrontendParametersSatellite &p);
-	RESULT setDVBC(eDVBFrontendParametersCable &p);
-	RESULT setDVBT(eDVBFrontendParametersTerrestrial &p);
-	
-	RESULT calculateDifference(const iDVBFrontendParameters *parm, int &diff) const;
-	
-	RESULT getHash(unsigned long &hash) 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 &, bool exact) const;
+
+	RESULT getHash(unsigned long &) const;
 };
 
+#ifndef SWIG
+
+#include <lib/dvb/sec.h>
+class eSecCommandList;
+
 class eDVBFrontend: public iDVBFrontend, public Object
 {
 	DECLARE_REF(eDVBFrontend);
+	bool m_enabled;
 	int m_type;
+	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];
 #endif
+
 	FRONTENDPARAMETERS parm;
 	int m_state;
 	Signal1<void,iDVBFrontend*> m_stateChanged;
@@ -53,19 +65,30 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
 	eSecCommandList m_sec_sequence;
 
-	int m_data[7]; /* when satellite frontend then
-		data[0] = lastcsw -> state of the committed switch
-		data[1] = lastucsw -> state of the uncommitted switch
-		data[2] = lastToneburst -> current state of toneburst switch
-		data[3] = newRotorCmd -> last sent rotor cmd
-		data[4] = newRotorPos -> current Rotor Position
-		data[5] = curRotorCmd
-		data[6] = curRotorPos */
+	enum {
+		CSW,                  // state of the committed switch
+		UCSW,                 // state of the uncommitted switch
+		TONEBURST,            // current state of toneburst switch
+		NEW_ROTOR_CMD,        // prev sent rotor cmd
+		NEW_ROTOR_POS,        // new rotor position (not validated)
+		ROTOR_CMD,            // completed rotor cmd (finalized)
+		ROTOR_POS,            // current rotor position
+		LINKED_PREV_PTR,      // prev double linked list (for linked FEs)
+		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
+	};
+
+	int m_data[NUM_DATA_ENTRIES];
 
 	int m_idleInputpower[2];  // 13V .. 18V
 	int m_runningInputpower;
+
 	int m_timeoutCount; // needed for timeout
-	int m_curVoltage;
+	int m_retryCount; // diseqc retry for rotor
 
 	void feEvent(int);
 	void timeout();
@@ -73,12 +96,17 @@ 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();
 
 	RESULT getFrontendType(int &type);
 	RESULT tune(const iDVBFrontendParameters &where);
+	RESULT prepare_sat(const eDVBFrontendParametersSatellite &);
+	RESULT prepare_cable(const eDVBFrontendParametersCable &);
+	RESULT prepare_terrestrial(const eDVBFrontendParametersTerrestrial &);
 	RESULT connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection);
 	RESULT getState(int &state);
 	RESULT setTone(int tone);
@@ -89,6 +117,22 @@ public:
 	RESULT setSecSequence(const eSecCommandList &list);
 	RESULT getData(int num, int &data);
 	RESULT setData(int num, int val);
+
+	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 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();
 };
 
+#endif // SWIG
 #endif