X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/185319be599e9f42cd695da14c01499fc79f68d5..1f3788c5e1a47fa9b0412902acba38c86b53bb63:/lib/dvb/idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index aa4d4bb2..ecf8bb92 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -223,12 +223,13 @@ class eDVBService: public iStaticServiceInformation
 public:
 	enum cacheID
 	{
-		cVPID, cAPID, cTPID, cPCRPID, cAC3PID, cacheMax
+		cVPID, cAPID, cTPID, cPCRPID, cAC3PID, cVTYPE, cacheMax
 	};
 
 	int getCachePID(cacheID);
 	void setCachePID(cacheID, int);
-	bool cacheEmpty() { return m_cache.empty(); }
+
+	bool cacheEmpty();
 
 	eDVBService();
 		/* m_service_name_sort is uppercase, with special chars removed, to increase sort performance. */
@@ -240,19 +241,18 @@ public:
 	int m_flags;
 	enum
 	{
-#if 0  // not yet implemented
 		dxNoSDT=1,    // don't get SDT
-		dxDontshow=2,
+//nyi	dxDontshow=2,
+		dxNoDVB=4,  // dont use PMT for this service ( use cached pids )
 		dxHoldName=8,
-#endif
 		dxNewFound=64,
-		dxNoDVB=4  // dont use PMT for this service ( use cached pids )
 	};
 
 	bool usePMT() const { return !(m_flags & dxNoDVB); }
 
-	std::set<int> m_ca;
-	std::map<int,int> m_cache;
+//	std::set<int> m_ca;
+
+	int m_cache[cacheMax];
 	virtual ~eDVBService();
 	
 	eDVBService &operator=(const eDVBService &);
@@ -316,11 +316,13 @@ public:
 class iDVBChannelList: public iObject
 {
 public:
-	virtual RESULT removeService(eServiceReferenceDVB service)=0;
+	virtual RESULT removeService(const eServiceReference &service)=0;
 	virtual RESULT removeServices(eDVBChannelID chid=eDVBChannelID(), unsigned int orb_pos=0xFFFFFFFF)=0;
-	virtual RESULT addFlag(eServiceReferenceDVB service, unsigned int flagmask=0xFFFFFFFF)=0;
-	virtual RESULT removeFlag(eServiceReferenceDVB service, unsigned int flagmask=0xFFFFFFFF)=0;
+	virtual RESULT removeServices(int dvb_namespace=-1, int tsid=-1, int onid=-1, unsigned int orb_pos=0xFFFFFFFF)=0;
+	virtual RESULT addFlag(const eServiceReference &service, unsigned int flagmask=0xFFFFFFFF)=0;
+	virtual RESULT removeFlag(const eServiceReference &service, unsigned int flagmask=0xFFFFFFFF)=0;
 	virtual RESULT removeFlags(unsigned int flagmask, eDVBChannelID chid=eDVBChannelID(), unsigned int orb_pos=0xFFFFFFFF)=0;
+	virtual RESULT removeFlags(unsigned int flagmask, int dvb_namespace=-1, int tsid=-1, int onid=-1, unsigned int orb_pos=0xFFFFFFFF)=0;
 	virtual RESULT addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm)=0;
 	virtual RESULT removeChannel(const eDVBChannelID &id)=0;
 	
@@ -552,6 +554,7 @@ public:
 };
 
 class iDVBSectionReader;
+class iDVBPESReader;
 class iDVBTSRecorder;
 class iTSMPEGDecoder;
 
@@ -559,6 +562,7 @@ class iDVBDemux: public iObject
 {
 public:
 	virtual RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)=0;
+	virtual RESULT createPESReader(eMainloop *context, ePtr<iDVBPESReader> &reader)=0;
 	virtual RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder)=0;
 	virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader, int primary=1)=0;
 	virtual RESULT getSTC(pts_t &pts, int num=0)=0;
@@ -570,8 +574,8 @@ class iTSMPEGDecoder: public iObject
 {
 public:
 	enum { pidDisabled = -1 };
-		/** Set Displayed Video PID */
-	virtual RESULT setVideoPID(int vpid)=0;
+		/** Set Displayed Video PID and type */
+	virtual RESULT setVideoPID(int vpid, int type)=0;
 
 	enum { af_MPEG, af_AC3, af_DTS };
 		/** Set Displayed Audio PID and type */