app-manager takes care of its own instancepointer in slot

diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp
index 7199453..4e5b6e6 100644 (file)
--- a/lib/dvb_ci/dvbci.cpp
+++ b/lib/dvb_ci/dvbci.cpp
@@ -140,9 +140,6 @@ void eDVBCISlot::data(int what)
                        notifier->setRequested(eSocketNotifier::Read);
                        //HACK
                        eDVBCI_UI::getInstance()->setState(0,0);
-                       //FIXME; do in deconstructor of the appmgr class                        
-                       application_manager = 0;
-                       mmi_session = 0;
                }
                return;
        }
@@ -185,10 +182,10 @@ DEFINE_REF(eDVBCISlot);
 eDVBCISlot::eDVBCISlot(eMainloop *context, int nr)
 {
        char filename[128];
-       
+
        application_manager = 0;
        mmi_session = 0;
-
+       
        slotid = nr;
 
        sprintf(filename, "/dev/ci%d", nr);

diff --git a/lib/dvb_ci/dvbci_appmgr.cpp b/lib/dvb_ci/dvbci_appmgr.cpp
index f07ea99..7843554 100644 (file)
--- a/lib/dvb_ci/dvbci_appmgr.cpp
+++ b/lib/dvb_ci/dvbci_appmgr.cpp
@@ -3,6 +3,17 @@
 #include <lib/dvb_ci/dvbci_appmgr.h>
 #include <lib/dvb_ci/dvbci_ui.h>
 
+eDVBCIApplicationManagerSession::eDVBCIApplicationManagerSession(eDVBCISlot *tslot)
+{
+       slot = tslot;
+       slot->application_manager       = this;
+}
+
+eDVBCIApplicationManagerSession::~eDVBCIApplicationManagerSession()
+{
+       slot = 0;
+}
+
 int eDVBCIApplicationManagerSession::receivedAPDU(const unsigned char *tag,const void *data, int len)
 {
        printf("SESSION(%d)/APP %02x %02x %02x: ", session_nb, tag[0], tag[1], tag[2]);

diff --git a/lib/dvb_ci/dvbci_appmgr.h b/lib/dvb_ci/dvbci_appmgr.h
index 1d6e7b1..7a94baf 100644 (file)
--- a/lib/dvb_ci/dvbci_appmgr.h
+++ b/lib/dvb_ci/dvbci_appmgr.h
@@ -8,10 +8,15 @@ class eDVBCIApplicationManagerSession: public eDVBCISession
        enum {
                stateFinal=statePrivate,
        };
+       
+       eDVBCISlot *slot;
+       
        int wantmenu;
        int receivedAPDU(const unsigned char *tag, const void *data, int len);
        int doAction();
 public:
+       eDVBCIApplicationManagerSession(eDVBCISlot *tslot);
+       ~eDVBCIApplicationManagerSession();
        int enterMenu();
        int startMMI();
 };

diff --git a/lib/dvb_ci/dvbci_session.cpp b/lib/dvb_ci/dvbci_session.cpp
index a0171a3..bb8ba86 100644 (file)
--- a/lib/dvb_ci/dvbci_session.cpp
+++ b/lib/dvb_ci/dvbci_session.cpp
@@ -136,7 +136,7 @@ eDVBCISession *eDVBCISession::createSession(eDVBCISlot *slot, const unsigned cha
                printf("session: %p\n",session);
                break;
        case 0x00020041:
-               session=slot->application_manager = new eDVBCIApplicationManagerSession;
+               session=slot->application_manager = new eDVBCIApplicationManagerSession(slot);
                printf("APPLICATION MANAGER\n");
                break;
        case 0x00030041: