X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fpmt.h;h=1888e05417fcd3e2ba9458d3d5e9b6fe80d176b3;hp=2d10f7a60fc931f732d3a53767cce92945de38cb;hb=69c8b669b814af168ed5bbedd60bdf2909274f12;hpb=b55f332be8d9490d2a01705ce13db4999112cc37

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index 2d10f7a..1888e05 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -102,6 +102,7 @@ class eDVBServicePMTHandler: public Object
 	
 	int m_use_decode_demux;
 	uint8_t m_decode_demux_num;
+	ePtr<eTimer> m_no_pat_entry_delay;
 public:
 	eDVBServicePMTHandler();
 	~eDVBServicePMTHandler();
@@ -144,7 +145,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;
@@ -185,13 +186,13 @@ public:
 		{
 			uint16_t caid;
 			int capid;
-			bool operator< (const struct capid_pair &t) { return t.caid < caid; }
+			bool operator< (const struct capid_pair &t) const { return t.caid < caid; }
 		};
 		std::vector<videoStream> videoStreams;
 		std::vector<audioStream> audioStreams;
 		int defaultAudioStream;
 		std::vector<subtitleStream> subtitleStreams;
-		std::set<capid_pair> caids;
+		std::list<capid_pair> caids;
 		int pcrPid;
 		int pmtPid;
 		int textPid;
@@ -210,12 +211,13 @@ public:
 	int getPMT(ePtr<eTable<ProgramMapSection> > &ptr) { return m_PMT.getCurrent(ptr); }
 	int getChannel(eUsePtr<iDVBChannel> &channel);
 	void resetCachedProgram() { m_have_cached_program = false; }
+	void sendEventNoPatEntry();
 
 	/* deprecated interface */
 	int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0, bool simulate=false, eDVBService *service = 0);
 
 	/* new interface */
-	int tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iDataSource> &, const char *streaminfo_file, eCueSheet *sg=0, bool simulate=false, eDVBService *service = 0);
+	int tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iTsSource> &, const char *streaminfo_file, eCueSheet *sg=0, bool simulate=false, eDVBService *service = 0);
 
 	void free();
 private: