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 961999e..a0e832c 100644 (file)
--- a/lib/dvb_ci/dvbci.h
+++ b/lib/dvb_ci/dvbci.h
@@ -3,33 +3,102 @@
 
 #include <lib/base/ebase.h>
 
+#include <set>
+
 class eDVBCISession;
+class eDVBCIApplicationManagerSession;
+class eDVBCICAManagerSession;
+class eDVBCIMMISession;
+class eDVBServicePMTHandler;
+class eDVBCISlot;
 
-class eDVBCISlot: public Object
+class eDVBCISlot: public iObject, public Object
 {
 DECLARE_REF(eDVBCISlot);
 private:
+       int slotid;
        int fd;
        void data(int);
-       eSocketNotifier *notifier_data;
-       void event(int);
-       eSocketNotifier *notifier_event;
-       
-       eDVBCISession *se;
+       eSocketNotifier *notifier;
+
+       int state;
+       enum {stateRemoved, stateInserted};
+       uint8_t prev_sent_capmt_version;
 public:
+       int use_count;
+
        eDVBCISlot(eMainloop *context, int nr);
-       virtual ~eDVBCISlot();
+       ~eDVBCISlot();
        
-       int eDVBCISlot::write(const unsigned char *data, size_t len);
+       int send(const unsigned char *data, size_t len);
+       
+       eDVBCIApplicationManagerSession *application_manager;
+       eDVBCICAManagerSession *ca_manager;
+       eDVBCIMMISession *mmi_session;
+       
+       int getSlotID();
+       int reset();
+       int initialize();
+       int startMMI();
+       int stopMMI();
+       int answerText(int answer);
+       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);
+       static eDVBCIInterfaces *instance;
 private:
        eSmartPtrList<eDVBCISlot>       m_slots;
+       eDVBCISlot *getSlot(int slotid);
+
+       PMTHandlerList m_pmt_handlers; 
 public:
        eDVBCIInterfaces();
-       virtual ~eDVBCIInterfaces();
+       ~eDVBCIInterfaces();
+
+       void addPMTHandler(eDVBServicePMTHandler *pmthandler);
+       void removePMTHandler(eDVBServicePMTHandler *pmthandler);
+       void gotPMT(eDVBServicePMTHandler *pmthandler);
+
+       static eDVBCIInterfaces *getInstance();
+       
+       int reset(int slot);
+       int initialize(int slot);
+       int startMMI(int slot);
+       int stopMMI(int slot);
+       int answerText(int slot, int answer);
+       int answerEnq(int slot, char *value);
+       int cancelEnq(int slot);
+       int getMMIState(int slot);
+       int enableTS(int slot, int enable);
 };
 
 #endif