#include <lib/dvb/specs.h>
#include <lib/dvb/dvb.h>
#include <lib/dvb/metaparser.h>
+#include <lib/dvb_ci/dvbci.h>
#include <dvbsi++/ca_program_map_section.h>
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);
}
m_demux->getCADemuxID(demux_num);
ePtr<eTable<ProgramMapSection> > ptr;
m_PMT.getCurrent(ptr);
- eDVBCAService::unregister_demux(m_reference, demux_num, ptr);
+ eDVBCAService::unregister_service(m_reference, demux_num, ptr);
}
+ eDVBCIInterfaces::getInstance()->removePMTHandler(this);
}
void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel)
else
{
serviceEvent(eventNewProgramInfo);
- if (!m_pvr_channel && !m_ca_servicePtr) // don't send campmt to camd.socket for playbacked services
+ if (!m_pvr_channel)
{
- uint8_t demux_num;
- m_demux->getCADemuxID(demux_num);
- eDVBCAService::register_demux(m_reference, demux_num, m_ca_servicePtr);
+ 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);
+ }
}
if (m_ca_servicePtr)
{
return -1;
}
+int eDVBServicePMTHandler::getChannel(eUsePtr<iDVBChannel> &channel)
+{
+ channel = m_channel;
+ if (channel)
+ return 0;
+ else
+ return -1;
+}
+
int eDVBServicePMTHandler::getDemux(ePtr<iDVBDemux> &demux)
{
demux = m_demux;
::close(m_sock);
}
-RESULT eDVBCAService::register_demux( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice )
+RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice )
{
CAServiceMap::iterator it = exist.find(ref);
if ( it != exist.end() )
return 0;
}
-RESULT eDVBCAService::unregister_demux( const eServiceReferenceDVB &ref, int demux_num, eTable<ProgramMapSection> *ptr )
+RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int demux_num, eTable<ProgramMapSection> *ptr )
{
CAServiceMap::iterator it = exist.find(ref);
if ( it == exist.end() )
uint8_t demux_mask = 0;
uint8_t first_demux_num = 0xFF;
+#if 1
int iter=0, max_demux_slots = sizeof(m_used_demux);
while ( iter < max_demux_slots )
{
}
++iter;
}
+#else
+ demux_mask = 3;
+ first_demux_num = 0;
+#endif
if ( first_demux_num == 0xFF )
{
return;
}
- const std::vector<ProgramMapSection*>::const_iterator i=ptr->getSections().begin();
+ std::vector<ProgramMapSection*>::const_iterator i=ptr->getSections().begin();
if ( i != ptr->getSections().end() )
{
CaProgramMapSection capmt(*i++, m_prev_build_hash ? 0x05 /*update*/ : 0x03 /*only*/, 0x01 );
tmp[0] = 0x82; // demux
tmp[1] = 0x02;
- tmp[3] = first_demux_num; // read section data from demux number
tmp[2] = demux_mask; // descramble bitmask
+ tmp[3] = first_demux_num; // read section data from demux number
capmt.injectDescriptor(tmp, false);
tmp[0] = 0x81; // dvbnamespace