X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/76776f400ac0c56441d5e139ca6c377e6f2d7190..a6f6641c559ba36617562c3a9e71338d620b7193:/lib/dvb/pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index f948e95c..538264db 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -5,9 +5,10 @@
 #include <lib/dvb/metaparser.h>
 #include <dvbsi++/ca_program_map_section.h>
 
-eDVBServicePMTHandler::eDVBServicePMTHandler()
+eDVBServicePMTHandler::eDVBServicePMTHandler(int record)
 	:m_pmt_pid(0xFFFF), m_ca_servicePtr(0)
 {
+	m_record = record;
 	eDVBResourceManager::getInstance(m_resourceManager);
 	CONNECT(m_PMT.tableReady, eDVBServicePMTHandler::PMTready);
 	CONNECT(m_PAT.tableReady, eDVBServicePMTHandler::PATready);
@@ -27,8 +28,8 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel)
 		&& (state == iDVBChannel::state_ok) && (!m_demux))
 	{
 		if (m_channel)
-			if (m_channel->getDemux(m_demux))
-				eDebug("shit it failed.. again.");
+			if (m_channel->getDemux(m_demux, m_record ? 0 : iDVBChannel::capDecode))
+				eDebug("Allocating a demux for now tuned-in channel failed.");
 		
 		serviceEvent(eventTuned);
 		
@@ -95,6 +96,7 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 	program.videoStreams.clear();
 	program.audioStreams.clear();
 	program.pcrPid = -1;
+	program.pmtPid = m_pmt_pid < 0x1fff ? m_pmt_pid : -1;
 
 	if (!m_PMT.getCurrent(ptr))
 	{
@@ -198,8 +200,6 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref)
 	RESULT res;
 	m_reference = ref;
 	
-//	ref.path = "/viva.ts"; // hrhr.
-	
 		/* is this a normal (non PVR) channel? */
 	if (ref.path.empty())
 	{
@@ -284,8 +284,8 @@ void eDVBCAService::buildCAPMT()
 
 		tmp[0] = 0x82; // demux
 		tmp[1] = 0x02;
-		m_parent.m_demux->getCADemuxID(tmp[2]);  // descramble on demux
-		m_parent.m_demux->getCADemuxID(tmp[3]);  // get section data from demux1
+		m_parent.m_demux->getCADemuxID(tmp[3]); // read section data from demux number
+		tmp[2] = 1 << tmp[3];			// descramble bitmask
 		capmt.injectDescriptor(tmp, false);
 
 		tmp[0] = 0x81; // dvbnamespace