X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fdemux.h;h=1a7db9791296190350adbb6f1caf9c580eb1e19b;hp=8f11e8403e6b9165bc69f9f8e3c292a39fb5b663;hb=10e7e45ae92d4fe06f70126ed256b87896dbc432;hpb=ce6a641bebc8e3e3ef14b624aa67d1dca1e8310e

diff --git a/lib/dvb/demux.h b/lib/dvb/demux.h
index 8f11e84..1a7db97 100644
--- a/lib/dvb/demux.h
+++ b/lib/dvb/demux.h
@@ -15,20 +15,25 @@ public:
 	virtual ~eDVBDemux();
 	
 	RESULT setSourceFrontend(int fenum);
+	int getSource() { return source; }
 	RESULT setSourcePVR(int pvrnum);
 	
 	RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &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 adapter, demux, source;
 	
 	int m_dvr_busy;
 	friend class eDVBSectionReader;
+	friend class eDVBPESReader;
 	friend class eDVBAudio;
 	friend class eDVBVideo;
 	friend class eDVBPCR;
@@ -43,14 +48,13 @@ private:
 class eDVBSectionReader: public iDVBSectionReader, public Object
 {
 	DECLARE_REF(eDVBSectionReader);
-private:
 	int fd;
 	Signal1<void, const __u8*> read;
 	ePtr<eDVBDemux> demux;
 	int active;
 	int checkcrc;
 	void data(int);
-	eSocketNotifier *notifier;
+	ePtr<eSocketNotifier> notifier;
 public:
 	
 	eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESULT &res);
@@ -60,6 +64,23 @@ public:
 	RESULT connectRead(const Slot1<void,const __u8*> &read, ePtr<eConnection> &conn);
 };
 
+class eDVBPESReader: public iDVBPESReader, public Object
+{
+	DECLARE_REF(eDVBPESReader);
+	int m_fd;
+	Signal2<void, const __u8*, int> m_read;
+	ePtr<eDVBDemux> m_demux;
+	int m_active;
+	void data(int);
+	ePtr<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
@@ -87,6 +108,7 @@ private:
 	void stopPID(int pid);
 	
 	eDVBRecordFileThread *m_thread;
+	void filepushEvent(int event);
 	
 	std::map<int,int> m_pids;
 	Signal1<void,int> m_event;