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

diff --git a/lib/dvb_ci/dvbci.h b/lib/dvb_ci/dvbci.h
index 2f528d2..c11a120 100644
--- a/lib/dvb_ci/dvbci.h
+++ b/lib/dvb_ci/dvbci.h
@@ -1,8 +1,11 @@
 #ifndef __dvbci_dvbci_h
 #define __dvbci_dvbci_h
 
-#include <lib/base/ebase.h>
+#ifndef SWIG
 
+#include <lib/base/ebase.h>
+#include <lib/service/iservice.h>
+#include <lib/python/python.h>
 #include <set>
 #include <queue>
 
@@ -12,6 +15,7 @@ class eDVBCICAManagerSession;
 class eDVBCIMMISession;
 class eDVBServicePMTHandler;
 class eDVBCISlot;
+class eDVBCIInterfaces;
 
 struct queueData
 {
@@ -34,28 +38,36 @@ 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
 {
-DECLARE_REF(eDVBCISlot);
-private:
+	friend class eDVBCIInterfaces;
+	DECLARE_REF(eDVBCISlot);
 	int slotid;
 	int fd;
-	void data(int);
-	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;
-public:
-	enum {stateRemoved, stateInserted, stateInvalid, stateResetted};
+	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);
 	~eDVBCISlot();
 	
@@ -102,15 +114,18 @@ struct CIPmtHandler
 
 typedef std::list<CIPmtHandler> PMTHandlerList;
 
+#endif // SWIG
+
 class eDVBCIInterfaces
 {
-DECLARE_REF(eDVBCIInterfaces);
+	DECLARE_REF(eDVBCIInterfaces);
 	static eDVBCIInterfaces *instance;
-private:
 	eSmartPtrList<eDVBCISlot> m_slots;
 	eDVBCISlot *getSlot(int slotid);
 	PMTHandlerList m_pmt_handlers; 
+#ifndef SWIG
 public:
+#endif
 	eDVBCIInterfaces();
 	~eDVBCIInterfaces();
 
@@ -121,8 +136,6 @@ public:
 	void ciRemoved(eDVBCISlot *slot);
 	int getSlotState(int slot);
 
-	static eDVBCIInterfaces *getInstance();
-	
 	int reset(int slot);
 	int initialize(int slot);
 	int startMMI(int slot);
@@ -133,6 +146,14 @@ public:
 	int getMMIState(int slot);
 	int sendCAPMT(int slot);
 	int setInputSource(int tunerno, data_source source);
+#ifdef SWIG
+public:
+#endif
+	static eDVBCIInterfaces *getInstance();
+	int getNumOfSlots() { return m_slots.size(); }
+	PyObject *getDescrambleRules(int slotid);
+	RESULT setDescrambleRules(int slotid, SWIG_PYOBJECT(ePyObject) );
+	PyObject *readCICaIds(int slotid);
 };
 
 #endif