X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4fcbd4dd4bee8c65b46b7185879c445beae6ca29..8e0ab624cb84003cb37b92e6872dfe08ad9d1f20:/lib/dvb/demux.cpp

diff --git a/lib/dvb/demux.cpp b/lib/dvb/demux.cpp
index bdd8e67d..f52bb601 100644
--- a/lib/dvb/demux.cpp
+++ b/lib/dvb/demux.cpp
@@ -59,6 +59,49 @@ RESULT eDVBDemux::getMPEGDecoder(ePtr<iTSMPEGDecoder> &decoder)
 	return 0;
 }
 
+RESULT eDVBDemux::getSTC(pts_t &pts)
+{
+	char filename[128];
+#if HAVE_DVB_API_VERSION < 3
+	sprintf(filename, "/dev/dvb/card%d/demux%d", adapter, demux);
+#else
+	sprintf(filename, "/dev/dvb/adapter%d/demux%d", adapter, demux);
+#endif
+	int fd = ::open(filename, O_RDWR);
+	
+	if (fd < 0)
+		return -ENODEV;
+
+	struct dmx_stc stc;
+	stc.num = 0;
+	stc.base = 1;
+	
+	if (ioctl(fd, DMX_GET_STC, &stc) < 0)
+	{
+		::close(fd);
+		return -1;
+	}
+	
+	pts = stc.stc;
+	
+	::close(fd);
+	return 0;
+}
+
+RESULT eDVBDemux::flush()
+{
+	// FIXME: implement flushing the PVR queue here.
+	
+	m_event(evtFlush);
+	return 0;
+}
+
+RESULT eDVBDemux::connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn)
+{
+	conn = new eConnection(this, m_event.connect(event));
+	return 0;
+}
+
 void eDVBSectionReader::data(int)
 {
 	__u8 data[4096]; // max. section size
@@ -99,7 +142,7 @@ eDVBSectionReader::eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESUL
 	
 	if (fd >= 0)
 	{
-		notifier=new eSocketNotifier(context, fd, eSocketNotifier::Read);
+		notifier=new eSocketNotifier(context, fd, eSocketNotifier::Read, false);
 		CONNECT(notifier->activated, eDVBSectionReader::data);
 		res = 0;
 	} else
@@ -125,6 +168,7 @@ RESULT eDVBSectionReader::start(const eDVBSectionFilterMask &mask)
 	if (fd < 0)
 		return -ENODEV;
 
+	notifier->start();
 #if HAVE_DVB_API_VERSION < 3
 	dmxSctFilterParams sct;
 #else
@@ -148,6 +192,8 @@ RESULT eDVBSectionReader::start(const eDVBSectionFilterMask &mask)
 	memcpy(sct.filter.mask, mask.mask, DMX_FILTER_SIZE);
 #if HAVE_DVB_API_VERSION >= 3
 	memcpy(sct.filter.mode, mask.mode, DMX_FILTER_SIZE);
+	if (::ioctl(fd, DMX_SET_BUFFER_SIZE, 8192*8) < 0)
+		eDebug("DMX_SET_BUFFER_SIZE failed(%m)");
 #endif
 	
 	res = ::ioctl(fd, DMX_SET_FILTER, &sct);
@@ -175,7 +221,8 @@ RESULT eDVBSectionReader::stop()
 
 	active=0;
 	::ioctl(fd, DMX_STOP);
-	
+	notifier->stop();
+
 	return 0;
 }