fix function type

[vuplus_dvbapp] / lib / dvb_ci / dvbci.h

diff --git a/lib/dvb_ci/dvbci.h b/lib/dvb_ci/dvbci.h
index bdfa5d9..a0e832c 100644 (file)
--- a/lib/dvb_ci/dvbci.h
+++ b/lib/dvb_ci/dvbci.h
@@ -3,10 +3,14 @@
 
 #include <lib/base/ebase.h>
 
+#include <set>
+
 class eDVBCISession;
 class eDVBCIApplicationManagerSession;
 class eDVBCICAManagerSession;
 class eDVBCIMMISession;
+class eDVBServicePMTHandler;
+class eDVBCISlot;
 
 class eDVBCISlot: public iObject, public Object
 {
@@ -18,8 +22,11 @@ private:
        eSocketNotifier *notifier;
 
        int state;
-       enum {stateRemoved, stateInserted};     
+       enum {stateRemoved, stateInserted};
+       uint8_t prev_sent_capmt_version;
 public:
+       int use_count;
+
        eDVBCISlot(eMainloop *context, int nr);
        ~eDVBCISlot();
        
@@ -35,9 +42,35 @@ 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; }
+       void resetPrevSentCAPMTVersion() { prev_sent_capmt_version = 0xFF; }
+       
+       int enableTS(int enable);
+
+};
+
+struct CIPmtHandler
+{
+       eDVBServicePMTHandler *pmthandler;
+       eDVBCISlot *cislot;
+       CIPmtHandler()
+               :pmthandler(NULL), cislot(NULL)
+       {}
+       CIPmtHandler( const CIPmtHandler &x )
+               :pmthandler(x.pmthandler), cislot(x.cislot)
+       {}
+       CIPmtHandler( eDVBServicePMTHandler *ptr )
+               :pmthandler(ptr), cislot(NULL)
+       {}
+       bool operator==(const CIPmtHandler &x) const { return x.pmthandler == pmthandler; }
 };
 
+typedef std::list<CIPmtHandler> PMTHandlerList;
+
 class eDVBCIInterfaces
 {
 DECLARE_REF(eDVBCIInterfaces);
@@ -45,10 +78,16 @@ DECLARE_REF(eDVBCIInterfaces);
 private:
        eSmartPtrList<eDVBCISlot>       m_slots;
        eDVBCISlot *getSlot(int slotid);
+
+       PMTHandlerList m_pmt_handlers; 
 public:
        eDVBCIInterfaces();
        ~eDVBCIInterfaces();
 
+       void addPMTHandler(eDVBServicePMTHandler *pmthandler);
+       void removePMTHandler(eDVBServicePMTHandler *pmthandler);
+       void gotPMT(eDVBServicePMTHandler *pmthandler);
+
        static eDVBCIInterfaces *getInstance();
        
        int reset(int slot);
@@ -56,7 +95,10 @@ 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);
+       int enableTS(int slot, int enable);
 };
 
 #endif