fix bluescreen in ci menu when no entries in a menulist an ok is pressed

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

diff --git a/lib/dvb_ci/dvbci.h b/lib/dvb_ci/dvbci.h
index e8f30ab6449e117706639fa0c2f4f7cf89a0c973..7605a6d96f1fe8e7fe72f6914bde2e4263abde85 100644 (file)
--- a/lib/dvb_ci/dvbci.h
+++ b/lib/dvb_ci/dvbci.h
@@ -4,6 +4,7 @@
 #include <lib/base/ebase.h>
 
 #include <set>
 #include <lib/base/ebase.h>
 
 #include <set>

+#include <queue>

 
 class eDVBCISession;
 class eDVBCIApplicationManagerSession;
 
 class eDVBCISession;
 class eDVBCIApplicationManagerSession;


@@ -12,6 +13,22 @@ class eDVBCIMMISession;
 class eDVBServicePMTHandler;
 class eDVBCISlot;
 
 class eDVBServicePMTHandler;
 class eDVBCISlot;
 

+struct queueData
+{
+       __u8 prio;
+       unsigned char *data;
+       unsigned int len;
+       queueData( unsigned char *data, unsigned int len, __u8 prio = 0 )
+               :prio(prio), data(data), len(len)
+       {
+
+       }
+       bool operator < ( const struct queueData &a ) const
+       {
+               return prio < a.prio;
+       }
+};
+

 class eDVBCISlot: public iObject, public Object
 {
 DECLARE_REF(eDVBCISlot);
 class eDVBCISlot: public iObject, public Object
 {
 DECLARE_REF(eDVBCISlot);


@@ -22,12 +39,13 @@ private:
        eSocketNotifier *notifier;
 
        int state;
        eSocketNotifier *notifier;
 
        int state;

-       enum {stateRemoved, stateInserted};
-       uint8_t prev_sent_capmt_version;
+       std::map<uint16_t, uint8_t> running_services;

        eDVBCIApplicationManagerSession *application_manager;
        eDVBCICAManagerSession *ca_manager;
        eDVBCIMMISession *mmi_session;
        eDVBCIApplicationManagerSession *application_manager;
        eDVBCICAManagerSession *ca_manager;
        eDVBCIMMISession *mmi_session;

+       std::priority_queue<queueData> sendqueue;

 public:
 public:

+       enum {stateRemoved, stateInserted, stateInvalid, stateResetted};

        int use_count;
 
        eDVBCISlot(eMainloop *context, int nr);
        int use_count;
 
        eDVBCISlot(eMainloop *context, int nr);


@@ -43,19 +61,18 @@ public:
        eDVBCIMMISession *getMMIManager() { return mmi_session; }
        eDVBCICAManagerSession *getCAManager() { return ca_manager; }
 
        eDVBCIMMISession *getMMIManager() { return mmi_session; }
        eDVBCICAManagerSession *getCAManager() { return ca_manager; }
 

+       int getState() { return state; }

        int getSlotID();
        int reset();
        int getSlotID();
        int reset();

-       int initialize();

        int startMMI();
        int stopMMI();
        int answerText(int answer);
        int answerEnq(char *value);
        int cancelEnq();
        int getMMIState();
        int startMMI();
        int stopMMI();
        int answerText(int answer);
        int answerEnq(char *value);
        int cancelEnq();
        int getMMIState();

-       void resendCAPMT();

        int sendCAPMT(eDVBServicePMTHandler *ptr, const std::vector<uint16_t> &caids=std::vector<uint16_t>());
        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; }
+       void removeService(uint16_t program_number=0xFFFF);
+       int getNumOfServices() { return running_services.size(); }

        
        int enableTS(int enable, int tuner=0);
 
        
        int enableTS(int enable, int tuner=0);
 


@@ -84,7 +101,7 @@ class eDVBCIInterfaces
 DECLARE_REF(eDVBCIInterfaces);
        static eDVBCIInterfaces *instance;
 private:
 DECLARE_REF(eDVBCIInterfaces);
        static eDVBCIInterfaces *instance;
 private:

-       eSmartPtrList<eDVBCISlot>       m_slots;
+       eSmartPtrList<eDVBCISlot> m_slots;

        eDVBCISlot *getSlot(int slotid);
 
        PMTHandlerList m_pmt_handlers; 
        eDVBCISlot *getSlot(int slotid);
 
        PMTHandlerList m_pmt_handlers; 


@@ -94,7 +111,10 @@ public:
 
        void addPMTHandler(eDVBServicePMTHandler *pmthandler);
        void removePMTHandler(eDVBServicePMTHandler *pmthandler);
 
        void addPMTHandler(eDVBServicePMTHandler *pmthandler);
        void removePMTHandler(eDVBServicePMTHandler *pmthandler);

+       void recheckPMTHandlers();

        void gotPMT(eDVBServicePMTHandler *pmthandler);
        void gotPMT(eDVBServicePMTHandler *pmthandler);

+       void ciRemoved(eDVBCISlot *slot);
+       int getSlotState(int slot);

 
        static eDVBCIInterfaces *getInstance();
        
 
        static eDVBCIInterfaces *getInstance();