X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Fpmt.h;h=aa5d34d9c0e9f61e0df7aaf0e64d5d9b7b6fb4ce;hb=a600a785717d30f1f9729592e6e8d9d5b3b9bb38;hp=de0de052fed7e77c11b6273944beff391405b165;hpb=5c23ca59b7a3bb2d3a2bf3b7ffc78e1ffa170200;p=vuplus_dvbapp

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index de0de05..aa5d34d 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -144,7 +144,7 @@ public:
 	{
 		int pid,
 		    rdsPid; // hack for some radio services which transmit radiotext on different pid (i.e. harmony fm, HIT RADIO FFH, ...)
-		enum { atMPEG, atAC3, atDTS, atAAC, atAACHE, atLPCM };
+		enum { atMPEG, atAC3, atDTS, atAAC, atAACHE, atLPCM, atDTSHD };
 		int type; // mpeg2, ac3, dts, ...
 		
 		int component_tag;
@@ -181,11 +181,17 @@ public:
 
 	struct program
 	{
+		struct capid_pair
+		{
+			uint16_t caid;
+			int capid;
+			bool operator< (const struct capid_pair &t) { return t.caid < caid; }
+		};
 		std::vector<videoStream> videoStreams;
 		std::vector<audioStream> audioStreams;
 		int defaultAudioStream;
 		std::vector<subtitleStream> subtitleStreams;
-		std::set<uint16_t> caids;
+		std::list<capid_pair> caids;
 		int pcrPid;
 		int pmtPid;
 		int textPid;
@@ -193,10 +199,10 @@ public:
 		PyObject *createPythonObject();
 	};
 
-	int getProgramInfo(struct program &program);
+	int getProgramInfo(program &program);
 	int getDataDemux(ePtr<iDVBDemux> &demux);
 	int getDecodeDemux(ePtr<iDVBDemux> &demux);
-	PyObject *getCaIds();
+	PyObject *getCaIds(bool pair=false); // caid / ecmpid pair
 	
 	int getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel);
 	int getServiceReference(eServiceReferenceDVB &service) { service = m_reference; return 0; }