X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fa4ce6edf7d5ab9852a2ee3c5bea0b32fd704465..e5107b2bd4b6167a39e4574769a0d992082296d5:/lib/dvb/demux.cpp

diff --git a/lib/dvb/demux.cpp b/lib/dvb/demux.cpp
index 0fbd6fbd..931c6c71 100644
--- a/lib/dvb/demux.cpp
+++ b/lib/dvb/demux.cpp
@@ -144,12 +144,15 @@ RESULT eDVBDemux::getSTC(pts_t &pts, int num)
 	
 	if (ioctl(fd, DMX_GET_STC, &stc) < 0)
 	{
+		eDebug("DMX_GET_STC failed!");
 		::close(fd);
 		return -1;
 	}
 	
 	pts = stc.stc;
 	
+	eDebug("DMX_GET_STC - %lld", pts);
+	
 	::close(fd);
 	return 0;
 }
@@ -302,7 +305,7 @@ void eDVBPESReader::data(int)
 			return;
 		if(r < 0)
 		{
-			if (errno == EAGAIN) /* ok */
+			if (errno == EAGAIN || errno == EINTR) /* ok */
 				return;
 			eWarning("ERROR reading PES (fd=%d) - %m", m_fd);
 			return;
@@ -405,7 +408,7 @@ public:
 	
 	void saveTimingInformation(const std::string &filename);
 protected:
-	void filterRecordData(const unsigned char *data, int len);
+	int filterRecordData(const unsigned char *data, int len, size_t &current_span_remaining);
 private:
 	eMPEGStreamParserTS m_ts_parser;
 	eMPEGStreamInformation m_stream_info;
@@ -429,11 +432,13 @@ void eDVBRecordFileThread::saveTimingInformation(const std::string &filename)
 	m_stream_info.save(filename.c_str());
 }
 
-void eDVBRecordFileThread::filterRecordData(const unsigned char *data, int len)
+int eDVBRecordFileThread::filterRecordData(const unsigned char *data, int len, size_t &current_span_remaining)
 {
 	m_ts_parser.parseData(m_current_offset, data, len);
 	
 	m_current_offset += len;
+	
+	return len;
 }
 
 DEFINE_REF(eDVBTSRecorder);
@@ -443,6 +448,7 @@ eDVBTSRecorder::eDVBTSRecorder(eDVBDemux *demux): m_demux(demux)
 	m_running = 0;
 	m_target_fd = -1;
 	m_thread = new eDVBRecordFileThread();
+  CONNECT(m_thread->m_event, eDVBTSRecorder::filepushEvent);
 #ifndef HAVE_ADD_PID
 	m_demux->m_dvr_busy = 1;
 #endif
@@ -648,3 +654,13 @@ void eDVBTSRecorder::stopPID(int pid)
 #endif
 	m_pids[pid] = -1;
 }
+
+void eDVBTSRecorder::filepushEvent(int event)
+{
+	switch (event)
+	{
+	case eFilePushThread::evtWriteError:
+		m_event(eventWriteError);
+		break;
+	}
+}