ci fixes (TODO: build reel ci resource handling.. at moment the first service get...

[enigma2.git] / lib / dvb / pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index e77c097d1a7b27075f20c3f30a49dc9d2037d2fd..54d189f4616a7d6ac964d3e4c42c6784e93e30dc 100644 (file)
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -13,7 +13,6 @@ eDVBServicePMTHandler::eDVBServicePMTHandler(int record)
        eDVBResourceManager::getInstance(m_resourceManager);
        CONNECT(m_PMT.tableReady, eDVBServicePMTHandler::PMTready);
        CONNECT(m_PAT.tableReady, eDVBServicePMTHandler::PATready);
-       eDVBCIInterfaces::getInstance()->addPMTHandler(this);
        eDebug("new PMT handler record: %d", m_record);
 }
 
@@ -28,8 +27,8 @@ eDVBServicePMTHandler::~eDVBServicePMTHandler()
                ePtr<eTable<ProgramMapSection> > ptr;
                m_PMT.getCurrent(ptr);
                eDVBCAService::unregister_service(m_reference, demux_num, ptr);
+               eDVBCIInterfaces::getInstance()->removePMTHandler(this);
        }
-       eDVBCIInterfaces::getInstance()->removePMTHandler(this);
 }
 
 void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel)
@@ -74,13 +73,14 @@ void eDVBServicePMTHandler::PMTready(int error)
                serviceEvent(eventNewProgramInfo);
                if (!m_pvr_channel)
                {
-                       eDVBCIInterfaces::getInstance()->gotPMT(this);
                        if(!m_ca_servicePtr)   // don't send campmt to camd.socket for playbacked services
                        {
                                uint8_t demux_num;
                                m_demux->getCADemuxID(demux_num);
                                eDVBCAService::register_service(m_reference, demux_num, m_ca_servicePtr);
+                               eDVBCIInterfaces::getInstance()->addPMTHandler(this);
                        }
+                       eDVBCIInterfaces::getInstance()->gotPMT(this);
                }
                if (m_ca_servicePtr)
                {
@@ -507,7 +507,7 @@ void eDVBCAService::sendCAPMT()
                int i=0;
                int lenbytes = m_capmt[3] & ~0x80;
                while(i < lenbytes)
-                       wp |= (m_capmt[4+i] << (8 * i++));
+                       wp = (wp << 8) | m_capmt[4 + i++];
                wp+=4;
                wp+=lenbytes;
        }