diff options
Diffstat (limited to 'lib/dvb_ci')
| -rw-r--r-- | lib/dvb_ci/dvbci.h | 6 | ||||
| -rw-r--r-- | lib/dvb_ci/dvbci_session.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/dvb_ci/dvbci.h b/lib/dvb_ci/dvbci.h index 603fadfd..8fa313e2 100644 --- a/lib/dvb_ci/dvbci.h +++ b/lib/dvb_ci/dvbci.h @@ -41,8 +41,7 @@ enum data_source class eDVBCISlot: public iObject, public Object { friend class eDVBCIInterfaces; -DECLARE_REF(eDVBCISlot); -private: + DECLARE_REF(eDVBCISlot); int slotid; int fd; eSocketNotifier *notifier; @@ -112,9 +111,8 @@ typedef std::list<CIPmtHandler> PMTHandlerList; class eDVBCIInterfaces { -DECLARE_REF(eDVBCIInterfaces); + DECLARE_REF(eDVBCIInterfaces); static eDVBCIInterfaces *instance; -private: eSmartPtrList<eDVBCISlot> m_slots; eDVBCISlot *getSlot(int slotid); PMTHandlerList m_pmt_handlers; diff --git a/lib/dvb_ci/dvbci_session.h b/lib/dvb_ci/dvbci_session.h index ae0d340d..89a58f3b 100644 --- a/lib/dvb_ci/dvbci_session.h +++ b/lib/dvb_ci/dvbci_session.h @@ -11,7 +11,6 @@ class eDVBCISession { DECLARE_REF(eDVBCISession); static ePtr<eDVBCISession> sessions[SLMS]; - static void deleteSessions(const eDVBCISlot *slot); static void createSession(eDVBCISlot *slot, const unsigned char *resource_identifier, unsigned char &status, ePtr<eDVBCISession> &ptr); static void sendSPDU(eDVBCISlot *slot, unsigned char tag,const void *data, int len, unsigned short session_nb, const void *apdu=0,int alen=0); static void sendOpenSessionResponse(eDVBCISlot *slot,unsigned char session_status, const unsigned char *resource_identifier,unsigned short session_nb); @@ -31,6 +30,7 @@ protected: public: virtual ~eDVBCISession(); + static void deleteSessions(const eDVBCISlot *slot); int poll() { if (action) { action=doAction(); return 1; } return 0; } enum { stateInCreation, stateBusy, stateInDeletion, stateStarted, statePrivate}; |