change session handling

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

diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp
index d76cd341c27390a874c79a11efedb48a2e778985..67b2eafaa163b3dccd22145d5d6217af9a01a63f 100644 (file)
--- a/lib/dvb_ci/dvbci.cpp
+++ b/lib/dvb_ci/dvbci.cpp
@@ -44,20 +44,22 @@ void eDVBCISlot::data(int)
        if(r < 0)
                eWarning("ERROR reading from CI - %m\n");
 
-       if(!se) {
+       if(state != stateInserted) {
+               state = stateInserted;
                eDebug("ci inserted");
-               se = new eDVBCISession(this);
-       
+
                /* enable HUP to detect removal or errors */
                notifier_event->start();
        }
 
        if(r > 0)
-               se->receiveData(data, r);
+               eDVBCISession::receiveData(this, data, r);
 }
 
 void eDVBCISlot::event(int)
 {
+       state = stateRemoved;
+
        eDebug("CI removed");
        
        /* kill the TransportConnection */
@@ -66,7 +68,7 @@ void eDVBCISlot::event(int)
        notifier_event->stop();
 }
 
-eDVBCISlot::eDVBCISlot(eMainloop *context, int nr): se(0)
+eDVBCISlot::eDVBCISlot(eMainloop *context, int nr)
 {
        char filename[128];