X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Ffrontend.h;h=5887f4049431c257f9160d425f6e166dc0b77c31;hp=e1556bd99fccd5e655397b88c0aacc37f7ba47ad;hb=e1cd84473da2da0d23f4cea1d4143f17a8fb5a2c;hpb=8a54d14d80727d2da69979419630c438967276e5

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index e1556bd..5887f40 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -72,9 +72,11 @@ private:
 	bool m_simulate;
 	bool m_enabled;
 	int m_type;
+	eDVBFrontend *m_simulate_fe; // only used to set frontend type in dvb.cpp
 	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];
@@ -84,8 +86,12 @@ private:
 	char m_sec_filename[128];
 #endif
 	FRONTENDPARAMETERS parm;
-	int m_cur_orbpos; // only valid when this is a DVB-S tuner
-	int m_cur_pol; // only valid when this is a DVB-S tuner
+	union {
+		eDVBFrontendParametersSatellite sat;
+		eDVBFrontendParametersCable cab;
+		eDVBFrontendParametersTerrestrial ter;
+	} oparm;
+
 	int m_state;
 	ePtr<iDVBSatelliteEquipmentControl> m_sec;
 	ePtr<eSocketNotifier> m_sn;
@@ -105,11 +111,12 @@ private:
 	void feEvent(int);
 	void timeout();
 	void tuneLoop();  // called by m_tuneTimer
+	int tuneLoopInt();
 	void setFrontend(bool recvEvents=true);
 	bool setSecSequencePos(int steps);
 	static int PriorityOrder;
 public:
-	eDVBFrontend(int adap, int fe, int &ok, bool simulate=false);
+	eDVBFrontend(int adap, int fe, int &ok, bool simulate=false, eDVBFrontend *simulate_fe=NULL);
 	virtual ~eDVBFrontend();
 
 	int readInputpower();
@@ -125,7 +132,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);
 
@@ -141,13 +148,11 @@ public:
 	static void setTypePriorityOrder(int val) { PriorityOrder = val; }
 	static int getTypePriorityOrder() { return PriorityOrder; }
 
+	void reopenFrontend();
 	int openFrontend();
-	int closeFrontend(bool force=false);
+	int closeFrontend(bool force=false, bool no_delayed=false);
 	const char *getDescription() const { return m_description; }
 	bool is_simulate() const { return m_simulate; }
-
-	RESULT turnOffSatCR(int satcr);
-	RESULT ScanSatCR();
 };
 
 #endif // SWIG