X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Fdemux.h;h=f539006337ed81d9e08bcd6eaf9b190584290b8d;hb=9412183a3c484b906775b2e117b6ee33c66083f6;hp=d3a369f96607c5afc04087b8716a3c7e0de832d4;hpb=6a1fc924eb21f22f9b522df233a9a98d4c5bdca7;p=vuplus_dvbapp

diff --git a/lib/dvb/demux.h b/lib/dvb/demux.h
index d3a369f..f539006 100644
--- a/lib/dvb/demux.h
+++ b/lib/dvb/demux.h
@@ -20,7 +20,7 @@ public:
 	RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader);
 	RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder);
 	RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);
-	RESULT getSTC(pts_t &pts);
+	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);
@@ -32,6 +32,7 @@ private:
 	friend class eDVBAudio;
 	friend class eDVBVideo;
 	friend class eDVBPCR;
+	friend class eDVBTText;
 	friend class eDVBTSRecorder;
 	friend class eDVBCAService;
 	Signal1<void, int> m_event;
@@ -59,7 +60,7 @@ public:
 	RESULT connectRead(const Slot1<void,const __u8*> &read, ePtr<eConnection> &conn);
 };
 
-class eFilePushThread;
+class eDVBRecordFileThread;
 
 class eDVBTSRecorder: public iDVBTSRecorder, public Object
 {
@@ -72,7 +73,7 @@ public:
 	RESULT addPID(int pid);
 	RESULT removePID(int pid);
 	
-	RESULT setFormat(int pid);
+	RESULT setTimingPID(int pid);
 	
 	RESULT setTargetFD(int fd);
 	RESULT setBoundary(off_t max);
@@ -84,14 +85,14 @@ private:
 	RESULT startPID(int pid);
 	void stopPID(int pid);
 	
-	eFilePushThread *m_thread;
+	eDVBRecordFileThread *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;
+	int m_running, m_target_fd, m_source_fd;
 };
 
 #endif