X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4b8b88b747f1229b3538320d934d686e0d71e812..3220cd98443043566e3617c564370683d011878e:/lib/dvb/pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index c9ff3cb6..54d189f4 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -3,6 +3,7 @@
 #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)
@@ -25,7 +26,8 @@ eDVBServicePMTHandler::~eDVBServicePMTHandler()
 		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);
 	}
 }
 
@@ -69,11 +71,16 @@ void eDVBServicePMTHandler::PMTready(int error)
 	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);
+			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)
 		{
@@ -200,6 +207,15 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 	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;
@@ -286,7 +302,7 @@ eDVBCAService::~eDVBCAService()
 	::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() )
@@ -316,7 +332,7 @@ RESULT eDVBCAService::register_demux( const eServiceReferenceDVB &ref, int demux
 	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() )
@@ -394,6 +410,7 @@ void eDVBCAService::buildCAPMT(eTable<ProgramMapSection> *ptr)
 	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 )
 	{
@@ -405,6 +422,10 @@ void eDVBCAService::buildCAPMT(eTable<ProgramMapSection> *ptr)
 		}
 		++iter;
 	}
+#else
+	demux_mask = 3;
+	first_demux_num = 0;
+#endif
 
 	if ( first_demux_num == 0xFF )
 	{
@@ -446,8 +467,8 @@ void eDVBCAService::buildCAPMT(eTable<ProgramMapSection> *ptr)
 
 		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
@@ -486,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;
 	}