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

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 6e272ac..e6e3aea 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -63,6 +63,9 @@ public:
 		FREQ_OFFSET,          // current frequency offset
 		CUR_VOLTAGE,          // current voltage
 		CUR_TONE,             // current continuous tone
+		SATCR,                // current SatCR
+		DICTION,              // current diction
+		PIN,                  // pin 
 		NUM_DATA_ENTRIES
 	};
 	Signal1<void,iDVBFrontend*> m_stateChanged;
@@ -70,12 +73,14 @@ private:
 	DECLARE_REF(eDVBFrontend);
 	bool m_simulate;
 	bool m_enabled;
-	int m_type;
+	bool m_fbc;
+	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;
+	std::map<fe_delivery_system_t, bool> m_delsys, m_delsys_whitelist;
 	char m_filename[128];
 	char m_description[128];
 #if HAVE_DVB_API_VERSION < 3
@@ -83,6 +88,8 @@ private:
 	char m_sec_filename[128];
 #endif
 	FRONTENDPARAMETERS parm;
+	eDVBFrontendParameters oparm;
+
 	int m_state;
 	ePtr<iDVBSatelliteEquipmentControl> m_sec;
 	ePtr<eSocketNotifier> m_sn;
@@ -102,15 +109,16 @@ 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;
+	static int PreferredFrontendIndex;
 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();
-	RESULT getFrontendType(int &type);
 	RESULT tune(const iDVBFrontendParameters &where);
 	RESULT prepare_sat(const eDVBFrontendParametersSatellite &, unsigned int timeout);
 	RESULT prepare_cable(const eDVBFrontendParametersCable &);
@@ -122,7 +130,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);
 
@@ -137,11 +145,20 @@ public:
 	bool setSlotInfo(ePyObject obj); // get a tuple (slotid, slotdescr)
 	static void setTypePriorityOrder(int val) { PriorityOrder = val; }
 	static int getTypePriorityOrder() { return PriorityOrder; }
+	static void setPreferredFrontend(int index) { PreferredFrontendIndex = index; }
+	static int getPreferredFrontend() { return PreferredFrontendIndex; }
+
+	bool supportsDeliverySystem(const fe_delivery_system_t &sys, bool obeywhitelist);
+	void setDeliverySystemWhitelist(const std::vector<fe_delivery_system_t> &whitelist);
 
+	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; }
+	bool is_FBCTuner() { return m_fbc; }
+	bool getEnabled() { return m_enabled; }
+	void setEnabled(bool enable) { m_enabled = enable; }
 };
 
 #endif // SWIG