X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Ffrontend.h;h=bef4a18f1de923ec37fe872c4a4456936377ab47;hp=6e272aca852574a3f8bd2fb7fc40f79f2641b64f;hb=c95ebd0688c39d4fa6e22e85d84fe7d80e3da013;hpb=56ac7a4a764a4251a851778df09967405aa9a930

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 6e272ac..bef4a18 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -63,6 +63,7 @@ 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;
@@ -74,6 +75,7 @@ private:
 	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];
@@ -83,6 +85,12 @@ private:
 	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;
@@ -102,7 +110,8 @@ 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);
 	static int PriorityOrder;
 public:
@@ -122,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);
 
@@ -138,8 +147,9 @@ 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; }
 };