X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/df31302ca30e09aa7d2183fcf6f61147bd1addf7..6fdb2d2094c50a2bc324f4094473c2107d2ea943:/lib/dvb_ci/dvbci.h

diff --git a/lib/dvb_ci/dvbci.h b/lib/dvb_ci/dvbci.h
index 603fadfd..de84e181 100644
--- a/lib/dvb_ci/dvbci.h
+++ b/lib/dvb_ci/dvbci.h
@@ -38,28 +38,34 @@ enum data_source
 	TUNER_A, TUNER_B, TUNER_C, TUNER_D, CI_A, CI_B, CI_C, CI_D
 };
 
+typedef std::pair<std::string, uint32_t> providerPair;
+typedef std::set<providerPair> providerSet;
+typedef std::set<uint16_t> caidSet;
+typedef std::set<eServiceReference> serviceSet;
+
 class eDVBCISlot: public iObject, public Object
 {
 	friend class eDVBCIInterfaces;
-DECLARE_REF(eDVBCISlot);
-private:
+	DECLARE_REF(eDVBCISlot);
 	int slotid;
 	int fd;
-	eSocketNotifier *notifier;
+	ePtr<eSocketNotifier> notifier;
 	int state;
 	std::map<uint16_t, uint8_t> running_services;
 	eDVBCIApplicationManagerSession *application_manager;
 	eDVBCICAManagerSession *ca_manager;
 	eDVBCIMMISession *mmi_session;
 	std::priority_queue<queueData> sendqueue;
-	std::set<uint16_t> possible_caids;
-	std::set<eServiceReference> possible_services;
-	std::set<std::string> possible_providers;
+	caidSet possible_caids;
+	serviceSet possible_services;
+	providerSet possible_providers;
 	int use_count;
 	eDVBCISlot *linked_next; // needed for linked CI handling
 	data_source current_source;
 	int current_tuner;
+	bool user_mapped;
 	void data(int);
+	bool plugged;
 public:
 	enum {stateRemoved, stateInserted, stateInvalid, stateResetted};
 	eDVBCISlot(eMainloop *context, int nr);
@@ -88,6 +94,7 @@ public:
 	void removeService(uint16_t program_number=0xFFFF);
 	int getNumOfServices() { return running_services.size(); }
 	int setSource(data_source source);
+	int setClockRate(int);
 };
 
 struct CIPmtHandler
@@ -112,9 +119,8 @@ typedef std::list<CIPmtHandler> PMTHandlerList;
 
 class eDVBCIInterfaces
 {
-DECLARE_REF(eDVBCIInterfaces);
+	DECLARE_REF(eDVBCIInterfaces);
 	static eDVBCIInterfaces *instance;
-private:
 	eSmartPtrList<eDVBCISlot> m_slots;
 	eDVBCISlot *getSlot(int slotid);
 	PMTHandlerList m_pmt_handlers; 
@@ -141,6 +147,7 @@ public:
 	int getMMIState(int slot);
 	int sendCAPMT(int slot);
 	int setInputSource(int tunerno, data_source source);
+	int setCIClockRate(int slot, int rate);
 #ifdef SWIG
 public:
 #endif
@@ -148,6 +155,7 @@ public:
 	int getNumOfSlots() { return m_slots.size(); }
 	PyObject *getDescrambleRules(int slotid);
 	RESULT setDescrambleRules(int slotid, SWIG_PYOBJECT(ePyObject) );
+	PyObject *readCICaIds(int slotid);
 };
 
 #endif