X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5..033a2333874297c1c388ecf4532de2bc2b11fb30:/lib/dvb/demux.h

diff --git a/lib/dvb/demux.h b/lib/dvb/demux.h
index 3b4cbede..d3a369f9 100644
--- a/lib/dvb/demux.h
+++ b/lib/dvb/demux.h
@@ -2,25 +2,46 @@
 #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 createTSRecorder(ePtr<iDVBTSRecorder> &recorder);
 	RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);
+	RESULT getSTC(pts_t &pts);
+	RESULT getCADemuxID(uint8_t &id) { id = demux; return 0; }
+	RESULT flush();
+	RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn);
+private:
+	int adapter, demux;
+	
+	int m_dvr_busy;
+	friend class eDVBSectionReader;
+	friend class eDVBAudio;
+	friend class eDVBVideo;
+	friend class eDVBPCR;
+	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 +59,39 @@ public:
 	RESULT connectRead(const Slot1<void,const __u8*> &read, ePtr<eConnection> &conn);
 };
 
+class eFilePushThread;
+
+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 setFormat(int pid);
+	
+	RESULT setTargetFD(int fd);
+	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);
+	
+	eFilePushThread *m_thread;
+	
+	std::map<int,int> m_pids;
+	Signal1<void,int> m_event;
+	
+	ePtr<eDVBDemux> m_demux;
+	
+	int m_running, m_format, m_target_fd, m_source_fd;
+};
+
 #endif