X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Ffrontend.h;h=11c5dfddbab2b1d87381773d6b5ef844151734f1;hp=5887f4049431c257f9160d425f6e166dc0b77c31;hb=7b7a80a1f979b0bd9c68aa33af968db25bf63f81;hpb=023864f9fe2db4ef8f74057b1afb21446b6b7ef7

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 5887f40..11c5dfd 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -64,6 +64,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,14 +73,13 @@ private:
 	DECLARE_REF(eDVBFrontend);
 	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;
+	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
@@ -86,11 +87,7 @@ private:
 	char m_sec_filename[128];
 #endif
 	FRONTENDPARAMETERS parm;
-	union {
-		eDVBFrontendParametersSatellite sat;
-		eDVBFrontendParametersCable cab;
-		eDVBFrontendParametersTerrestrial ter;
-	} oparm;
+	eDVBFrontendParameters oparm;
 
 	int m_state;
 	ePtr<iDVBSatelliteEquipmentControl> m_sec;
@@ -115,12 +112,12 @@ private:
 	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 *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 &);
@@ -147,6 +144,10 @@ 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();