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

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index b8ed76f9..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);
 };
 
@@ -61,15 +61,17 @@ class eDVBServicePMTHandler: public Object
 	
 	void channelStateChanged(iDVBChannel *);
 	ePtr<eConnection> m_channelStateChanged_connection;
+	void channelEvent(iDVBChannel *, int event);
+	ePtr<eConnection> m_channelEvent_connection;
 
 	void PMTready(int error);
 	void PATready(int error);
 	
-	int m_record;
-	static int m_count;
+	int m_use_decode_demux;
+	uint8_t m_decode_demux_num;
+	
 public:
-	static int getCount() { return m_count; }
-	eDVBServicePMTHandler(int record);
+	eDVBServicePMTHandler();
 	~eDVBServicePMTHandler();
 	
 	enum
@@ -80,14 +82,18 @@ public:
 		eventNoPATEntry,   // no pat entry for the corresponding SID could be found
 		eventNoPMT,        // no pmt could be received (timeout)
 		eventNewProgramInfo, // we just received a PMT
-		eventTuned         // a channel was sucessfully (re-)tuned in, you may start additional filters now
+		eventTuned,        // a channel was sucessfully (re-)tuned in, you may start additional filters now
+		
+		eventSOF,          // seek pre start
+		eventEOF,          // a file playback did end
 	};
 
 	Signal1<void,int> serviceEvent;
-	
+
 	struct videoStream
 	{
 		int pid;
+		int component_tag;
 	};
 	
 	struct audioStream
@@ -107,16 +113,21 @@ public:
 		// ca info
 		int pcrPid;
 		int pmtPid;
+		int textPid;
+		bool isCrypted;
 	};
 	
 	int getProgramInfo(struct program &program);
-	int getDemux(ePtr<iDVBDemux> &demux);
+	int getDataDemux(ePtr<iDVBDemux> &demux);
+	int getDecodeDemux(ePtr<iDVBDemux> &demux);
+	
 	int getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel);
 	int getService(eServiceReferenceDVB &service) { service = m_reference; return 0; }
 	int getPMT(ePtr<eTable<ProgramMapSection> > &ptr) { return m_PMT.getCurrent(ptr); }
 	int getChannel(eUsePtr<iDVBChannel> &channel);
 
-	int tune(eServiceReferenceDVB &ref);
+	int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0);
+	void free();
 };
 
 #endif