X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Ffrontend.h;h=bef4a18f1de923ec37fe872c4a4456936377ab47;hp=3670ceb800ee37745e33f8cdfbbc4b62df56736c;hb=c95ebd0688c39d4fa6e22e85d84fe7d80e3da013;hpb=40f102b5f749e9d66236f0a1dafcbd403f10b013

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 3670ceb..bef4a18 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);
@@ -12,21 +13,29 @@ class eDVBFrontendParameters: public iDVBFrontendParameters
 		eDVBFrontendParametersTerrestrial terrestrial;
 	};
 	int m_type;
+	int m_flags;
 public:
 	eDVBFrontendParameters();
-	
-	RESULT getSystem(int &type) const;
-	RESULT getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const;
-	RESULT getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const;
-	RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const;
+	~eDVBFrontendParameters()
+	{
+	}
+
+	SWIG_VOID(RESULT) getSystem(int &SWIG_OUTPUT) const;
+	SWIG_VOID(RESULT) getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const;
+	SWIG_VOID(RESULT) getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const;
+	SWIG_VOID(RESULT) getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) 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) const;
-	
-	RESULT getHash(unsigned long &SWIG_OUTPUT) const;
+	SWIG_VOID(RESULT) getFlags(unsigned int &SWIG_NAMED_OUTPUT(flags)) const { flags = m_flags; return 0; }
+	RESULT setFlags(unsigned int flags) { m_flags = flags; return 0; }
+#ifndef SWIG
+	RESULT calculateDifference(const iDVBFrontendParameters *parm, int &, bool exact) const;
+
+	RESULT getHash(unsigned long &) const;
+	RESULT calcLockTimeout(unsigned int &) const;
+#endif
 };
 
 #ifndef SWIG
@@ -36,28 +45,11 @@ class eSecCommandList;
 
 class eDVBFrontend: public iDVBFrontend, public Object
 {
-	DECLARE_REF(eDVBFrontend);
-	int m_type;
-	int m_fe;
-	int m_fd;
-	char m_filename[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;
-	ePtr<iDVBSatelliteEquipmentControl> m_sec;
-	eSocketNotifier *m_sn;
-	int m_tuning;
-	eTimer *m_timeout;
-	eTimer *m_tuneTimer;
-
-	eSecCommandList m_sec_sequence;
-
+public:
 	enum {
+		NEW_CSW,
+		NEW_UCSW,
+		NEW_TONEBURST,
 		CSW,                  // state of the committed switch
 		UCSW,                 // state of the uncommitted switch
 		TONEBURST,            // current state of toneburst switch
@@ -69,31 +61,67 @@ 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
+		SATCR,                // current SatCR
 		NUM_DATA_ENTRIES
 	};
+	Signal1<void,iDVBFrontend*> m_stateChanged;
+private:
+	DECLARE_REF(eDVBFrontend);
+	bool m_simulate;
+	bool m_enabled;
+	int m_type;
+	int m_dvbid;
+	int m_slotid;
+	int m_fd;
+	bool m_rotor_mode;
+	bool m_need_rotor_workaround;
+	bool m_can_handle_dvbs2;
+	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;
+	union {
+		eDVBFrontendParametersSatellite sat;
+		eDVBFrontendParametersCable cab;
+		eDVBFrontendParametersTerrestrial ter;
+	} oparm;
+
+	int m_state;
+	ePtr<iDVBSatelliteEquipmentControl> m_sec;
+	ePtr<eSocketNotifier> m_sn;
+	int m_tuning;
+	ePtr<eTimer> m_timeout, m_tuneTimer;
+
+	eSecCommandList m_sec_sequence;
 
-	int m_data[NUM_DATA_ENTRIES];
+	long m_data[NUM_DATA_ENTRIES];
 
 	int m_idleInputpower[2];  // 13V .. 18V
 	int m_runningInputpower;
 
 	int m_timeoutCount; // needed for timeout
 	int m_retryCount; // diseqc retry for rotor
-	int m_curVoltage;
 
 	void feEvent(int);
 	void timeout();
 	void tuneLoop();  // called by m_tuneTimer
-	void setFrontend();
-	int readInputpower();
+	int tuneLoopInt();
+	void setFrontend(bool recvEvents=true);
 	bool setSecSequencePos(int steps);
+	static int PriorityOrder;
 public:
-	eDVBFrontend(int adap, int fe, int &ok);	
+	eDVBFrontend(int adap, int fe, int &ok, bool simulate=false);
 	virtual ~eDVBFrontend();
 
+	int readInputpower();
 	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);
@@ -103,18 +131,27 @@ public:
 	RESULT sendDiseqc(const eDVBDiseqcCommand &diseqc);
 	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 setSecSequence(eSecCommandList &list);
+	RESULT getData(int num, long &data);
+	RESULT setData(int num, long val);
 
-	int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, locked, synced
-	PyObject *readTransponderData(bool original);
+	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; }
 
+	void reopenFrontend();
 	int openFrontend();
-	int closeFrontend();
+	int closeFrontend(bool force=false, bool no_delayed=false);
+	const char *getDescription() const { return m_description; }
+	bool is_simulate() const { return m_simulate; }
 };
 
 #endif // SWIG