ci fixes (TODO: build reel ci resource handling.. at moment the first service get...

[enigma2.git] / lib / dvb_ci / dvbci.h

diff --git a/lib/dvb_ci/dvbci.h b/lib/dvb_ci/dvbci.h
index 1df87eaae49ee60c2cd48c74b40292a0359757b4..0c1051ba66829c3c52a3fa91df0cecfb8183c92e 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 eDVBCISlot;
 
 class eDVBCISlot: public iObject, public Object
 {
@@ -24,6 +25,8 @@ private:
        enum {stateRemoved, stateInserted};
        uint8_t prev_sent_capmt_version;
 public:
+       int use_count;
+
        eDVBCISlot(eMainloop *context, int nr);
        ~eDVBCISlot();
        
@@ -39,7 +42,8 @@ public:
        int startMMI();
        int stopMMI();
        int answerText(int answer);
-       int answerEnq(int answer, char *value);
+       int answerEnq(char *value);
+       int cancelEnq();
        int getMMIState();
        int sendCAPMT(eDVBServicePMTHandler *ptr, const std::vector<uint16_t> &caids=std::vector<uint16_t>());
        uint8_t getPrevSentCAPMTVersion() const { return prev_sent_capmt_version; }
@@ -49,20 +53,20 @@ public:
 struct CIPmtHandler
 {
        eDVBServicePMTHandler *pmthandler;
-       eDVBCISlot *usedby;
+       eDVBCISlot *cislot;
        CIPmtHandler()
-               :pmthandler(NULL), usedby(NULL)
+               :pmthandler(NULL), cislot(NULL)
        {}
        CIPmtHandler( const CIPmtHandler &x )
-               :pmthandler(x.pmthandler), usedby(x.usedby)
+               :pmthandler(x.pmthandler), cislot(x.cislot)
        {}
        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> PMTHandlerSet;
+typedef std::list<CIPmtHandler> PMTHandlerList;
 
 class eDVBCIInterfaces
 {
@@ -72,7 +76,7 @@ private:
        eSmartPtrList<eDVBCISlot>       m_slots;
        eDVBCISlot *getSlot(int slotid);
 
-       PMTHandlerSet m_pmt_handlers; 
+       PMTHandlerList m_pmt_handlers; 
 public:
        eDVBCIInterfaces();
        ~eDVBCIInterfaces();
@@ -88,7 +92,8 @@ public:
        int startMMI(int slot);
        int stopMMI(int slot);
        int answerText(int slot, int answer);
-       int answerEnq(int slot, int answer, char *value);
+       int answerEnq(int slot, char *value);
+       int cancelEnq(int slot);
        int getMMIState(int slot);
 };