fixes for powerpc, thanks to pieter

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

diff --git a/lib/dvb/demux.h b/lib/dvb/demux.h
index 3b4cbede06fe9b0ef22d45effc26c1916d6000c0..ee731ef826a372d0f4859d679931826c99b65411 100644 (file)
--- a/lib/dvb/demux.h
+++ b/lib/dvb/demux.h
@@ -2,25 +2,51 @@
 #define __dvb_demux_h
 
 #include <lib/dvb/idvb.h>
-#include <lib/dvb/isection.h>
+#include <lib/dvb/idemux.h>
 
-class eDVBDemux: public virtual iDVBDemux
+class eDVBDemux: public iDVBDemux
 {
-       int adapter, demux;
-       friend class eDVBSectionReader;
-       friend class eDVBAudio;
-       friend class eDVBVideo;
+       DECLARE_REF(eDVBDemux);
 public:
-       DECLARE_REF
+       enum {
+               evtFlush
+       };
        eDVBDemux(int adapter, int demux);
        virtual ~eDVBDemux();
+       
+       RESULT setSourceFrontend(int fenum);
+       RESULT setSourcePVR(int pvrnum);
+       
        RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader);
-       RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);
+       RESULT createPESReader(eMainloop *context, ePtr<iDVBPESReader> &reader);
+       RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder);
+       RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader, int primary);
+       RESULT getSTC(pts_t &pts, int num);
+       RESULT getCADemuxID(uint8_t &id) { id = demux; return 0; }
+       RESULT flush();
+       RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn);
+       
+       int getRefCount() { return ref; }
+private:
+       int adapter, demux;
+       
+       int m_dvr_busy;
+       friend class eDVBSectionReader;
+       friend class eDVBPESReader;
+       friend class eDVBAudio;
+       friend class eDVBVideo;
+       friend class eDVBPCR;
+       friend class eDVBTText;
+       friend class eDVBTSRecorder;
+       friend class eDVBCAService;
+       Signal1<void, int> m_event;
+       
+       int openDemux(void);
 };
 
-class eDVBSectionReader: public virtual iDVBSectionReader, public Object
+class eDVBSectionReader: public iDVBSectionReader, public Object
 {
-       DECLARE_REF
+       DECLARE_REF(eDVBSectionReader);
 private:
        int fd;
        Signal1<void, const __u8*> read;
@@ -38,4 +64,59 @@ public:
        RESULT connectRead(const Slot1<void,const __u8*> &read, ePtr<eConnection> &conn);
 };
 
+class eDVBPESReader: public iDVBPESReader, public Object
+{
+       DECLARE_REF(eDVBPESReader);
+private:
+       int m_fd;
+       Signal2<void, const __u8*, int> m_read;
+       ePtr<eDVBDemux> m_demux;
+       int m_active;
+       void data(int);
+       eSocketNotifier *m_notifier;
+public:
+       eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res);
+       virtual ~eDVBPESReader();
+       RESULT start(int pid);
+       RESULT stop();
+       RESULT connectRead(const Slot2<void,const __u8*, int> &read, ePtr<eConnection> &conn);
+};
+
+class eDVBRecordFileThread;
+
+class eDVBTSRecorder: public iDVBTSRecorder, public Object
+{
+       DECLARE_REF(eDVBTSRecorder);
+public:
+       eDVBTSRecorder(eDVBDemux *demux);
+       ~eDVBTSRecorder();
+
+       RESULT start();
+       RESULT addPID(int pid);
+       RESULT removePID(int pid);
+       
+       RESULT setTimingPID(int pid);
+       
+       RESULT setTargetFD(int fd);
+       RESULT setTargetFilename(const char *filename);
+       RESULT setBoundary(off_t max);
+       
+       RESULT stop();
+       
+       RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn);
+private:
+       RESULT startPID(int pid);
+       void stopPID(int pid);
+       
+       eDVBRecordFileThread *m_thread;
+       
+       std::map<int,int> m_pids;
+       Signal1<void,int> m_event;
+       
+       ePtr<eDVBDemux> m_demux;
+       
+       int m_running, m_target_fd, m_source_fd;
+       std::string m_target_filename;
+};
+
 #endif