X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/87625f1aa211991c803ecbb5980972238136ac57..8d162c6432e74a8f2a2982a017b8af528223c8e7:/lib/dvb/pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index c886c39a..c0c65b27 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -3,7 +3,9 @@
 #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>
+#include <dvbsi++/descriptor_tag.h>
 
 eDVBServicePMTHandler::eDVBServicePMTHandler(int record)
 	:m_ca_servicePtr(0)
@@ -26,6 +28,7 @@ eDVBServicePMTHandler::~eDVBServicePMTHandler()
 		ePtr<eTable<ProgramMapSection> > ptr;
 		m_PMT.getCurrent(ptr);
 		eDVBCAService::unregister_service(m_reference, demux_num, ptr);
+		eDVBCIInterfaces::getInstance()->removePMTHandler(this);
 	}
 }
 
@@ -69,11 +72,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_service(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)
 		{
@@ -150,6 +158,21 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 					isaudio = 1;
 					audio.type = audioStream::atMPEG;
 					break;
+				case 0x06: // PES Private
+						/* PES private can contain AC-3, DTS or lots of other stuff.
+						   check descriptors to get the exact type. */
+					for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin();
+							desc != (*es)->getDescriptors()->end(); ++desc)
+					{
+						switch ((*desc)->getTag())
+						{
+						case AC3_DESCRIPTOR:
+							isaudio = 1;
+							audio.type = audioStream::atAC3;
+							break;
+						}
+					}
+					break;
 				}
 				if (isaudio)
 					program.audioStreams.push_back(audio);
@@ -200,6 +223,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;
@@ -491,7 +523,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;
 	}