hopefully fix SatConfig (rebuilding new choices each time the satconfig is called...

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

diff --git a/lib/dvb_ci/dvbci.h b/lib/dvb_ci/dvbci.h
index 0c1051ba66829c3c52a3fa91df0cecfb8183c92e..8fa313e2709c8cfaa4d2e153a8b603e60c12fd62 100644 (file)
--- a/lib/dvb_ci/dvbci.h
+++ b/lib/dvb_ci/dvbci.h
@@ -1,9 +1,13 @@
 #ifndef __dvbci_dvbci_h
 #define __dvbci_dvbci_h
 
 #ifndef __dvbci_dvbci_h
 #define __dvbci_dvbci_h
 

-#include <lib/base/ebase.h>
+#ifndef SWIG

 
 

+#include <lib/base/ebase.h>
+#include <lib/service/iservice.h>
+#include <lib/python/python.h>

 #include <set>
 #include <set>

+#include <queue>

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


@@ -11,34 +15,68 @@ class eDVBCICAManagerSession;
 class eDVBCIMMISession;
 class eDVBServicePMTHandler;
 class eDVBCISlot;
 class eDVBCIMMISession;
 class eDVBServicePMTHandler;
 class eDVBCISlot;

+class eDVBCIInterfaces;
+
+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;
+       }
+};
+
+enum data_source
+{
+       TUNER_A, TUNER_B, TUNER_C, TUNER_D, CI_A, CI_B, CI_C, CI_D
+};

 
 class eDVBCISlot: public iObject, public Object
 {
 
 class eDVBCISlot: public iObject, public Object
 {

-DECLARE_REF(eDVBCISlot);
-private:
+       friend class eDVBCIInterfaces;
+       DECLARE_REF(eDVBCISlot);

        int slotid;
        int fd;
        int slotid;
        int fd;

-       void data(int);

        eSocketNotifier *notifier;
        eSocketNotifier *notifier;

-

        int state;
        int state;

-       enum {stateRemoved, stateInserted};
-       uint8_t prev_sent_capmt_version;
-public:
+       std::map<uint16_t, uint8_t> running_services;
+       eDVBCIApplicationManagerSession *application_manager;
+       eDVBCICAManagerSession *ca_manager;
+       eDVBCIMMISession *mmi_session;
+       std::priority_queue<queueData> sendqueue;
+       std::set<uint16_t> possible_caids;
+       std::set<eServiceReference> possible_services;
+       std::set<std::string> possible_providers;

        int use_count;
        int use_count;

-
+       eDVBCISlot *linked_next; // needed for linked CI handling
+       data_source current_source;
+       int current_tuner;
+       void data(int);
+public:
+       enum {stateRemoved, stateInserted, stateInvalid, stateResetted};

        eDVBCISlot(eMainloop *context, int nr);
        ~eDVBCISlot();
        
        int send(const unsigned char *data, size_t len);
        eDVBCISlot(eMainloop *context, int nr);
        ~eDVBCISlot();
        
        int send(const unsigned char *data, size_t len);

-       
-       eDVBCIApplicationManagerSession *application_manager;
-       eDVBCICAManagerSession *ca_manager;
-       eDVBCIMMISession *mmi_session;
-       
+
+       void setAppManager( eDVBCIApplicationManagerSession *session );
+       void setMMIManager( eDVBCIMMISession *session );
+       void setCAManager( eDVBCICAManagerSession *session );
+
+       eDVBCIApplicationManagerSession *getAppManager() { return application_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 startMMI();
        int stopMMI();
        int answerText(int answer);


@@ -46,8 +84,9 @@ public:
        int cancelEnq();
        int getMMIState();
        int sendCAPMT(eDVBServicePMTHandler *ptr, const std::vector<uint16_t> &caids=std::vector<uint16_t>());
        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; }
+       void removeService(uint16_t program_number=0xFFFF);
+       int getNumOfServices() { return running_services.size(); }
+       int setSource(data_source source);

 };
 
 struct CIPmtHandler
 };
 
 struct CIPmtHandler


@@ -68,25 +107,28 @@ struct CIPmtHandler
 
 typedef std::list<CIPmtHandler> PMTHandlerList;
 
 
 typedef std::list<CIPmtHandler> PMTHandlerList;
 

+#endif // SWIG
+

 class eDVBCIInterfaces
 {
 class eDVBCIInterfaces
 {

-DECLARE_REF(eDVBCIInterfaces);
+       DECLARE_REF(eDVBCIInterfaces);

        static eDVBCIInterfaces *instance;
        static eDVBCIInterfaces *instance;

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

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

-

        PMTHandlerList m_pmt_handlers; 
        PMTHandlerList m_pmt_handlers; 

+#ifndef SWIG

 public:
 public:

+#endif

        eDVBCIInterfaces();
        ~eDVBCIInterfaces();
 
        void addPMTHandler(eDVBServicePMTHandler *pmthandler);
        void removePMTHandler(eDVBServicePMTHandler *pmthandler);
        eDVBCIInterfaces();
        ~eDVBCIInterfaces();
 
        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();
-       

        int reset(int slot);
        int initialize(int slot);
        int startMMI(int slot);
        int reset(int slot);
        int initialize(int slot);
        int startMMI(int slot);


@@ -95,6 +137,15 @@ public:
        int answerEnq(int slot, char *value);
        int cancelEnq(int slot);
        int getMMIState(int slot);
        int answerEnq(int slot, char *value);
        int cancelEnq(int slot);
        int getMMIState(int slot);

+       int sendCAPMT(int slot);
+       int setInputSource(int tunerno, data_source source);
+#ifdef SWIG
+public:
+#endif
+       static eDVBCIInterfaces *getInstance();
+       int getNumOfSlots() { return m_slots.size(); }
+       PyObject *getDescrambleRules(int slotid);
+       RESULT setDescrambleRules(int slotid, SWIG_PYOBJECT(ePyObject) );

 };
 
 #endif
 };
 
 #endif