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. */
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,
- dxNewFound=64, // found in prev scan
-#endif
- dxNoDVB=4 // dont use PMT for this service ( use cached pids )
+ dxNewFound=64,
};
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 &);
tSatellitePosition,
tChannelID,
tAND,
- tOR
+ tOR,
+ tAny,
+ tFlags
};
int m_type;
class iDVBChannelList: public iObject
{
public:
+ virtual RESULT removeService(const eServiceReference &service)=0;
+ virtual RESULT removeServices(eDVBChannelID chid=eDVBChannelID(), unsigned int orb_pos=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;
};
class iDVBSectionReader;
+class iDVBPESReader;
class iDVBTSRecorder;
class iTSMPEGDecoder;
{
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)=0;
+ virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader, int primary=1)=0;
virtual RESULT getSTC(pts_t &pts, int num=0)=0;
virtual RESULT getCADemuxID(uint8_t &id)=0;
virtual RESULT flush()=0;
{
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 */