X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Ffrontend.h;h=39d125a91c2e1e45972a0a01492625f37773da4b;hp=50648b99e2f9ac7c2aa83eeb570c9880c463fa1f;hb=faaf85f037e9d29dd9f5178016caf7c80776d55b;hpb=dba8122997839f5084ebb20594f28ac9ceff207a

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 50648b9..39d125a 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -47,6 +47,9 @@ class eDVBFrontend: public iDVBFrontend, public Object
 {
 public:
 	enum {
+		LINKABLE_CSW,
+		LINKABLE_UCSW,
+		LINKABLE_TONEBURST,
 		NEW_CSW,
 		NEW_UCSW,
 		NEW_TONEBURST,
@@ -64,6 +67,8 @@ public:
 		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;
@@ -71,27 +76,20 @@ private:
 	DECLARE_REF(eDVBFrontend);
 	bool m_simulate;
 	bool m_enabled;
-	int m_type;
+	bool m_fbc;
+	bool m_is_usbtuner;
 	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;
-	bool m_can_handle_dvbt2;
+	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
-	int m_secfd;
-	char m_sec_filename[128];
-#endif
+	dvb_frontend_info fe_info;
 	FRONTENDPARAMETERS parm;
-	union {
-		eDVBFrontendParametersSatellite sat;
-		eDVBFrontendParametersCable cab;
-		eDVBFrontendParametersTerrestrial ter;
-	} oparm;
+	eDVBFrontendParameters oparm;
 
 	int m_state;
 	ePtr<iDVBSatelliteEquipmentControl> m_sec;
@@ -122,7 +120,6 @@ public:
 	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 &);
@@ -152,11 +149,22 @@ public:
 	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, bool no_delayed=false);
 	const char *getDescription() const { return m_description; }
 	bool is_simulate() const { return m_simulate; }
+	bool is_FBCTuner() { return m_fbc; }
+	void setFBCTuner(bool enable) { m_fbc = enable; }
+	bool getEnabled() { return m_enabled; }
+	void setEnabled(bool enable) { m_enabled = enable; }
+	bool isLoopTimerActive() { return m_tuneTimer->isActive(); }
+	bool isScheduledSendDiseqc();
+	void setUSBTuner(bool yesno) { m_is_usbtuner = yesno; }
+	bool is_multistream();
 };
 
 #endif // SWIG