projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
[vuplus_dvbapp]
/
lib
/
dvb_ci
/
dvbci.h
diff --git
a/lib/dvb_ci/dvbci.h
b/lib/dvb_ci/dvbci.h
index
4e3fcce
..
c11a120
100644
(file)
--- a/
lib/dvb_ci/dvbci.h
+++ b/
lib/dvb_ci/dvbci.h
@@
-38,6
+38,11
@@
enum data_source
TUNER_A, TUNER_B, TUNER_C, TUNER_D, CI_A, CI_B, CI_C, CI_D
};
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;
class eDVBCISlot: public iObject, public Object
{
friend class eDVBCIInterfaces;
@@
-51,14
+56,16
@@
class eDVBCISlot: public iObject, public Object
eDVBCICAManagerSession *ca_manager;
eDVBCIMMISession *mmi_session;
std::priority_queue<queueData> sendqueue;
eDVBCICAManagerSession *ca_manager;
eDVBCIMMISession *mmi_session;
std::priority_queue<queueData> sendqueue;
-
std::set<uint16_t>
possible_caids;
- s
td::set<eServiceReference>
possible_services;
-
std::set<std::string>
possible_providers;
+
caidSet
possible_caids;
+ s
erviceSet
possible_services;
+
providerSet
possible_providers;
int use_count;
eDVBCISlot *linked_next; // needed for linked CI handling
data_source current_source;
int current_tuner;
int use_count;
eDVBCISlot *linked_next; // needed for linked CI handling
data_source current_source;
int current_tuner;
+ bool user_mapped;
void data(int);
void data(int);
+ bool first_plugged;
public:
enum {stateRemoved, stateInserted, stateInvalid, stateResetted};
eDVBCISlot(eMainloop *context, int nr);
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) );
int getNumOfSlots() { return m_slots.size(); }
PyObject *getDescrambleRules(int slotid);
RESULT setDescrambleRules(int slotid, SWIG_PYOBJECT(ePyObject) );
+ PyObject *readCICaIds(int slotid);
};
#endif
};
#endif