X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0b30e9845b60aae63e6d7e5b8e3a80bdfe4e4ad5..191cade7c45bee53df2776ff5bb3f26b2cdafc12:/lib/dvb/pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 679d7a8f..47251835 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -5,6 +5,7 @@
 #include <lib/dvb/metaparser.h>
 #include <lib/dvb_ci/dvbci.h>
 #include <lib/dvb/epgcache.h>
+#include <dvbsi++/ca_descriptor.h>
 #include <dvbsi++/ca_program_map_section.h>
 #include <dvbsi++/teletext_descriptor.h>
 #include <dvbsi++/descriptor_tag.h>
@@ -36,7 +37,7 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel)
 	{
 		if (m_channel)
 			if (m_channel->getDemux(m_demux, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode))
-				eDebug("Allocating a demux for now tuned-in channel failed.");
+				eDebug("Allocating %s-decoding a demux for now tuned-in channel failed.", m_use_decode_demux ? "" : "non-");
 		
 		serviceEvent(eventTuned);
 		
@@ -134,6 +135,76 @@ void eDVBServicePMTHandler::PATready(int)
 		serviceEvent(eventNoPAT);
 }
 
+PyObject *eDVBServicePMTHandler::getCaIds()
+{
+	PyObject *ret=0;
+
+	ePtr<eTable<ProgramMapSection> > ptr;
+
+	if ( ((m_service && m_service->usePMT()) || !m_service) && !m_PMT.getCurrent(ptr))
+	{
+		uint16_t caids[255];
+		memset(caids, 0, sizeof(caids));
+		std::vector<ProgramMapSection*>::const_iterator i = ptr->getSections().begin();
+		for (; i != ptr->getSections().end(); ++i)
+		{
+			const ProgramMapSection &pmt = **i;
+			ElementaryStreamInfoConstIterator es = pmt.getEsInfo()->begin();
+			for (; es != pmt.getEsInfo()->end(); ++es)
+			{
+				for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin();
+						desc != (*es)->getDescriptors()->end(); ++desc)
+				{
+					switch ((*desc)->getTag())
+					{
+						case CA_DESCRIPTOR:
+						{
+							const CaDescriptor *cadescr = (const CaDescriptor*)*desc;
+							uint16_t caid = cadescr->getCaSystemId();
+							int idx=0;
+							while (caids[idx] && caids[idx] != caid)
+								++idx;
+							caids[idx]=caid;
+							break;
+						}
+					}
+				}
+			}
+			for (DescriptorConstIterator desc = pmt.getDescriptors()->begin();
+				desc != pmt.getDescriptors()->end(); ++desc)
+			{
+				switch ((*desc)->getTag())
+				{
+					case CA_DESCRIPTOR:
+					{
+						const CaDescriptor *cadescr = (const CaDescriptor*)*desc;
+						uint16_t caid = cadescr->getCaSystemId();
+						int idx=0;
+						while (caids[idx] && caids[idx] != caid)
+							++idx;
+						caids[idx]=caid;
+						break;
+					}
+				}
+			}
+		}
+		int cnt=0;
+		while (caids[cnt])
+			++cnt;
+		if (cnt)
+		{
+			ret=PyList_New(cnt);
+			while(cnt--)
+				PyList_SET_ITEM(ret, cnt, PyInt_FromLong(caids[cnt]));
+		}
+	}
+
+	if (!ret)
+		ret=PyList_New(0);
+
+	return ret;
+}
+
 int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 {
 	ePtr<eTable<ProgramMapSection> > ptr;