X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/721f838966ed31bde07d08792154e0750d6dd9ae..4ad28359f1e3090e963e1a8083c34c0940d0514d:/lib/dvb/pmt.h

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index aabac24d..b7115ae2 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -15,14 +15,14 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-class eDVBServicePMTHandler;
+class eDVBCAService;
 
 typedef std::map<eServiceReferenceDVB, eDVBCAService*> CAServiceMap;
 
 class eDVBCAService: public Object
 {
 	eServiceReferenceDVB m_service;
-	uint8_t m_used_demux[10];
+	uint8_t m_used_demux[32];
 	unsigned int m_prev_build_hash;
 
 	int m_sock, m_clilen; 
@@ -37,8 +37,8 @@ class eDVBCAService: public Object
 	eDVBCAService();
 	~eDVBCAService();
 public:
-	static RESULT register_service( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice );
-	static RESULT unregister_service( const eServiceReferenceDVB &ref, int demux_num, eTable<ProgramMapSection> *ptr );
+	static RESULT register_service( const eServiceReferenceDVB &ref, int demux_nums[2], eDVBCAService *&caservice );
+	static RESULT unregister_service( const eServiceReferenceDVB &ref, int demux_nums[2], eTable<ProgramMapSection> *ptr );
 	void buildCAPMT(eTable<ProgramMapSection> *ptr);
 };
 
@@ -68,6 +68,7 @@ class eDVBServicePMTHandler: public Object
 	void PATready(int error);
 	
 	int m_use_decode_demux;
+	uint8_t m_decode_demux_num;
 	
 public:
 	eDVBServicePMTHandler();
@@ -83,6 +84,7 @@ public:
 		eventNewProgramInfo, // we just received a PMT
 		eventTuned,        // a channel was sucessfully (re-)tuned in, you may start additional filters now
 		
+		eventSOF,          // seek pre start
 		eventEOF,          // a file playback did end
 	};
 
@@ -111,6 +113,7 @@ public:
 		// ca info
 		int pcrPid;
 		int pmtPid;
+		int textPid;
 		bool isCrypted;
 	};
 	
@@ -123,7 +126,7 @@ public:
 	int getPMT(ePtr<eTable<ProgramMapSection> > &ptr) { return m_PMT.getCurrent(ptr); }
 	int getChannel(eUsePtr<iDVBChannel> &channel);
 
-	int tune(eServiceReferenceDVB &ref, int use_decode_demux);
+	int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0);
 	void free();
 };