add teletext.cpp

[enigma2.git] / lib / dvb / idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index de2b56442cbdf63bdb257e93c7c9d400b7342717..060804299d2152741a58eb9818dee899b5c76122 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -240,13 +240,11 @@ 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,
-               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); }
@@ -292,7 +290,9 @@ public:
                tSatellitePosition,
                tChannelID,
                tAND,
-               tOR
+               tOR,
+               tAny,
+               tFlags
        };
        
        int m_type;
@@ -314,6 +314,13 @@ public:
 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;
        
@@ -545,6 +552,7 @@ public:
 };
 
 class iDVBSectionReader;
+class iDVBPESReader;
 class iDVBTSRecorder;
 class iTSMPEGDecoder;
 
@@ -552,6 +560,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;