X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fpmt.h;h=721a8fcaf58d37a597a9305fa2b565dbeda8e000;hp=ff0ef046090e115ebec629af3bfbc97d50dff7b8;hb=55b8dd6115c2bb0921842c6dc77aafb8d0a40c4f;hpb=4c2cba9ccb6f754aac9378e2fc2c7b546e6d589c

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index ff0ef04..721a8fc 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -123,6 +123,7 @@ public:
 		eventNewProgramInfo, // we just received a PMT
 		eventTuned,        // a channel was sucessfully (re-)tuned in, you may start additional filters now
 		
+		eventPreStart,     // before start filepush thread
 		eventSOF,          // seek pre start
 		eventEOF,          // a file playback did end
 		
@@ -135,14 +136,15 @@ public:
 	{
 		int pid;
 		int component_tag;
-		enum { vtMPEG2, vtMPEG4_H264 };
+		enum { vtMPEG2, vtMPEG4_H264, vtMPEG1, vtMPEG4_Part2, vtVC1, vtVC1_SM };
 		int type;
 	};
 	
 	struct audioStream
 	{
-		int pid;
-		enum { atMPEG, atAC3, atDTS, atAAC };
+		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 };
 		int type; // mpeg2, ac3, dts, ...
 		
 		int component_tag;
@@ -188,7 +190,6 @@ public:
 		int pmtPid;
 		int textPid;
 		bool isCrypted() { return !caids.empty(); }
-		
 		PyObject *createPythonObject();
 	};
 
@@ -204,7 +205,12 @@ public:
 	int getChannel(eUsePtr<iDVBChannel> &channel);
 	void resetCachedProgram() { m_have_cached_program = false; }
 
-	int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0, bool simulate=false);
+	/* 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);
+
 	void free();
 private:
 	bool m_have_cached_program;