projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make it work on the mecker-compiler
[vuplus_dvbapp]
/
lib
/
dvb_ci
/
dvbci.h
diff --git
a/lib/dvb_ci/dvbci.h
b/lib/dvb_ci/dvbci.h
index
1921ad7
..
0c1051b
100644
(file)
--- a/
lib/dvb_ci/dvbci.h
+++ b/
lib/dvb_ci/dvbci.h
@@
-10,6
+10,7
@@
class eDVBCIApplicationManagerSession;
class eDVBCICAManagerSession;
class eDVBCIMMISession;
class eDVBServicePMTHandler;
class eDVBCICAManagerSession;
class eDVBCIMMISession;
class eDVBServicePMTHandler;
+class eDVBCISlot;
class eDVBCISlot: public iObject, public Object
{
class eDVBCISlot: public iObject, public Object
{
@@
-24,6
+25,8
@@
private:
enum {stateRemoved, stateInserted};
uint8_t prev_sent_capmt_version;
public:
enum {stateRemoved, stateInserted};
uint8_t prev_sent_capmt_version;
public:
+ int use_count;
+
eDVBCISlot(eMainloop *context, int nr);
~eDVBCISlot();
eDVBCISlot(eMainloop *context, int nr);
~eDVBCISlot();
@@
-50,20
+53,20
@@
public:
struct CIPmtHandler
{
eDVBServicePMTHandler *pmthandler;
struct CIPmtHandler
{
eDVBServicePMTHandler *pmthandler;
- eDVBCISlot *
usedby
;
+ eDVBCISlot *
cislot
;
CIPmtHandler()
CIPmtHandler()
- :pmthandler(NULL),
usedby
(NULL)
+ :pmthandler(NULL),
cislot
(NULL)
{}
CIPmtHandler( const CIPmtHandler &x )
{}
CIPmtHandler( const CIPmtHandler &x )
- :pmthandler(x.pmthandler),
usedby(x.usedby
)
+ :pmthandler(x.pmthandler),
cislot(x.cislot
)
{}
CIPmtHandler( eDVBServicePMTHandler *ptr )
{}
CIPmtHandler( eDVBServicePMTHandler *ptr )
- :pmthandler(ptr),
usedby
(NULL)
+ :pmthandler(ptr),
cislot
(NULL)
{}
{}
- bool operator
<(const CIPmtHandler &x) const { return x.pmthandler <
pmthandler; }
+ bool operator
==(const CIPmtHandler &x) const { return x.pmthandler ==
pmthandler; }
};
};
-typedef std::
set<CIPmtHandler> PMTHandlerSe
t;
+typedef std::
list<CIPmtHandler> PMTHandlerLis
t;
class eDVBCIInterfaces
{
class eDVBCIInterfaces
{
@@
-73,7
+76,7
@@
private:
eSmartPtrList<eDVBCISlot> m_slots;
eDVBCISlot *getSlot(int slotid);
eSmartPtrList<eDVBCISlot> m_slots;
eDVBCISlot *getSlot(int slotid);
- PMTHandler
Se
t m_pmt_handlers;
+ PMTHandler
Lis
t m_pmt_handlers;
public:
eDVBCIInterfaces();
~eDVBCIInterfaces();
public:
eDVBCIInterfaces();
~eDVBCIInterfaces();