follow timer API change

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

diff --git a/lib/dvb/demux.h b/lib/dvb/demux.h
index b07239be5a6cdff680e0a70ef251c4003be40e68..a01cf60b63b2caf8fdf25a8e758d60683b02a70d 100644 (file)
--- a/lib/dvb/demux.h
+++ b/lib/dvb/demux.h
@@ -14,6 +14,7 @@ class eDVBDemux: public iDVBDemux
        friend class eDVBVideo;
        friend class eDVBPCR;
        friend class eDVBTSRecorder;
        friend class eDVBVideo;
        friend class eDVBPCR;
        friend class eDVBTSRecorder;

+       friend class eDVBCAService;

 public:
        DECLARE_REF(eDVBDemux);
        eDVBDemux(int adapter, int demux);
 public:
        DECLARE_REF(eDVBDemux);
        eDVBDemux(int adapter, int demux);


@@ -21,6 +22,8 @@ public:
        RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader);
        RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder);
        RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);
        RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader);
        RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder);
        RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);

+       RESULT getSTC(pts_t &pts);
+       RESULT getCADemuxID(uint8_t &id) { id = demux; return 0; }

 };
 
 class eDVBSectionReader: public iDVBSectionReader, public Object
 };
 
 class eDVBSectionReader: public iDVBSectionReader, public Object


@@ -43,7 +46,7 @@ public:
        RESULT connectRead(const Slot1<void,const __u8*> &read, ePtr<eConnection> &conn);
 };
 
        RESULT connectRead(const Slot1<void,const __u8*> &read, ePtr<eConnection> &conn);
 };
 

-class eDVBTSRecorderThread;
+class eFilePushThread;

 
 class eDVBTSRecorder: public iDVBTSRecorder, public Object
 {
 
 class eDVBTSRecorder: public iDVBTSRecorder, public Object
 {


@@ -68,7 +71,7 @@ private:
        RESULT startPID(int pid);
        void stopPID(int pid);
        
        RESULT startPID(int pid);
        void stopPID(int pid);
        

-       eDVBTSRecorderThread *m_thread;
+       eFilePushThread *m_thread;

        
        std::map<int,int> m_pids;
        Signal1<void,int> m_event;
        
        std::map<int,int> m_pids;
        Signal1<void,int> m_event;