X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Ffrontend.h;h=bef4a18f1de923ec37fe872c4a4456936377ab47;hp=9d9aab718a70a479971dd772d39cef333f4b5c28;hb=55b8dd6115c2bb0921842c6dc77aafb8d0a40c4f;hpb=256711935ca5934a9e1a8c0d7b103aa46801e3cf

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 9d9aab7..bef4a18 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -13,25 +13,29 @@ class eDVBFrontendParameters: public iDVBFrontendParameters
 		eDVBFrontendParametersTerrestrial terrestrial;
 	};
 	int m_type;
+	int m_flags;
 public:
 	eDVBFrontendParameters();
 	~eDVBFrontendParameters()
 	{
 	}
 
-	RESULT getSystem(int &type) const;
-	RESULT getDVBS(eDVBFrontendParametersSatellite &) const;
-	RESULT getDVBC(eDVBFrontendParametersCable &) const;
-	RESULT getDVBT(eDVBFrontendParametersTerrestrial &) const;
+	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);
-
+	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
@@ -43,6 +47,9 @@ class eDVBFrontend: public iDVBFrontend, public Object
 {
 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
@@ -56,16 +63,19 @@ public:
 		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];
@@ -75,12 +85,17 @@ private:
 	char m_sec_filename[128];
 #endif
 	FRONTENDPARAMETERS parm;
+	union {
+		eDVBFrontendParametersSatellite sat;
+		eDVBFrontendParametersCable cab;
+		eDVBFrontendParametersTerrestrial ter;
+	} oparm;
+
 	int m_state;
 	ePtr<iDVBSatelliteEquipmentControl> m_sec;
-	eSocketNotifier *m_sn;
+	ePtr<eSocketNotifier> m_sn;
 	int m_tuning;
-	eTimer *m_timeout;
-	eTimer *m_tuneTimer;
+	ePtr<eTimer> m_timeout, m_tuneTimer;
 
 	eSecCommandList m_sec_sequence;
 
@@ -95,12 +110,12 @@ private:
 	void feEvent(int);
 	void timeout();
 	void tuneLoop();  // called by m_tuneTimer
-	void setFrontend();
+	int tuneLoopInt();
+	void setFrontend(bool recvEvents=true);
 	bool setSecSequencePos(int steps);
-	void setRotorData(int pos, int cmd);
 	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();
@@ -116,7 +131,7 @@ public:
 	RESULT sendDiseqc(const eDVBDiseqcCommand &diseqc);
 	RESULT sendToneburst(int burst);
 	RESULT setSEC(iDVBSatelliteEquipmentControl *sec);
-	RESULT setSecSequence(const eSecCommandList &list);
+	RESULT setSecSequence(eSecCommandList &list);
 	RESULT getData(int num, long &data);
 	RESULT setData(int num, long val);
 
@@ -132,9 +147,11 @@ public:
 	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