X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fdemux.h;h=7a697d49db27b5473db29b4d07b77bf800a5202f;hp=ee731ef826a372d0f4859d679931826c99b65411;hb=e90006f23e9a87b65a3fbb8b5abf5f6b4432817c;hpb=d80bb0a6b9862171d9901b6b19347b5e9f6279cd

diff --git a/lib/dvb/demux.h b/lib/dvb/demux.h
index ee731ef..7a697d4 100644
--- a/lib/dvb/demux.h
+++ b/lib/dvb/demux.h
@@ -15,6 +15,7 @@ public:
 	virtual ~eDVBDemux();
 	
 	RESULT setSourceFrontend(int fenum);
+	int getSource() { return source; }
 	RESULT setSourcePVR(int pvrnum);
 	
 	RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader);
@@ -28,7 +29,7 @@ public:
 	
 	int getRefCount() { return ref; }
 private:
-	int adapter, demux;
+	int adapter, demux, source;
 	
 	int m_dvr_busy;
 	friend class eDVBSectionReader;
@@ -47,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);
@@ -67,13 +67,12 @@ public:
 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;
+	ePtr<eSocketNotifier> m_notifier;
 public:
 	eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res);
 	virtual ~eDVBPESReader();
@@ -95,20 +94,23 @@ public:
 	RESULT addPID(int pid);
 	RESULT removePID(int pid);
 	
-	RESULT setTimingPID(int pid);
+	RESULT setTimingPID(int pid, int type);
 	
 	RESULT setTargetFD(int fd);
 	RESULT setTargetFilename(const char *filename);
 	RESULT setBoundary(off_t max);
 	
 	RESULT stop();
-	
+
+	RESULT getCurrentPCR(pts_t &pcr);
+
 	RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn);
 private:
 	RESULT startPID(int pid);
 	void stopPID(int pid);
 	
 	eDVBRecordFileThread *m_thread;
+	void filepushEvent(int event);
 	
 	std::map<int,int> m_pids;
 	Signal1<void,int> m_event;