X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb_ci%2Fdvbci.h;h=c11a1203311ab32fd828a29963252cedb55b5414;hp=8fa313e2709c8cfaa4d2e153a8b603e60c12fd62;hb=0ffeb4cf114a6706ba629112c070e3d94da98793;hpb=2e0270746af934180499931f95ed91c444c8233e;ds=sidebyside

diff --git a/lib/dvb_ci/dvbci.h b/lib/dvb_ci/dvbci.h
index 8fa313e..c11a120 100644
--- a/lib/dvb_ci/dvbci.h
+++ b/lib/dvb_ci/dvbci.h
@@ -38,27 +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);
 	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 first_plugged;
 public:
 	enum {stateRemoved, stateInserted, stateInvalid, stateResetted};
 	eDVBCISlot(eMainloop *context, int nr);
@@ -146,6 +153,7 @@ public:
 	int getNumOfSlots() { return m_slots.size(); }
 	PyObject *getDescrambleRules(int slotid);
 	RESULT setDescrambleRules(int slotid, SWIG_PYOBJECT(ePyObject) );
+	PyObject *readCICaIds(int slotid);
 };
 
 #endif