X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6a1fc924eb21f22f9b522df233a9a98d4c5bdca7..462ec6f4ad2051551cb91c75ba614d3b7b17c543:/lib/dvb/demux.cpp

diff --git a/lib/dvb/demux.cpp b/lib/dvb/demux.cpp
index d2a2a545..384a77e1 100644
--- a/lib/dvb/demux.cpp
+++ b/lib/dvb/demux.cpp
@@ -6,12 +6,23 @@
 #include <unistd.h>
 #include <signal.h>
 
-
 #if HAVE_DVB_API_VERSION < 3
 #include <ost/dmx.h>
+
 #ifndef DMX_SET_NEGFILTER_MASK
 	#define DMX_SET_NEGFILTER_MASK   _IOW('o',48,uint8_t *)
 #endif
+
+#ifndef DMX_GET_STC
+	struct dmx_stc
+	{
+		unsigned int num;	/* input : which STC? O..N */
+		unsigned int base;	/* output: divisor for stc to get 90 kHz clock */
+		unsigned long long stc; /* output: src in 'base'*90 kHz units */
+	};
+	#define DMX_GET_STC		_IOR('o', 50, struct dmx_stc)
+#endif
+
 #else
 #include <linux/dvb/dmx.h>
 #endif
@@ -49,18 +60,29 @@ DEFINE_REF(eDVBDemux)
 
 RESULT eDVBDemux::setSourceFrontend(int fenum)
 {
+#if HAVE_DVB_API_VERSION >= 3
 	int fd = openDemux();
-	int res = ::ioctl(fd, DMX_SET_SOURCE, DMX_SOURCE_FRONT0 + fenum);
+	
+	int n = DMX_SOURCE_FRONT0 + fenum;
+	int res = ::ioctl(fd, DMX_SET_SOURCE, &n);
+	if (res)
+		eDebug("DMX_SET_SOURCE failed! - %m");
 	::close(fd);
 	return res;
+#endif
+	return 0;
 }
 
 RESULT eDVBDemux::setSourcePVR(int pvrnum)
 {
+#if HAVE_DVB_API_VERSION >= 3
 	int fd = openDemux();
-	int res = ::ioctl(fd, DMX_SET_SOURCE, DMX_SOURCE_DVR0 + pvrnum);
+	int n = DMX_SOURCE_DVR0 + pvrnum;
+	int res = ::ioctl(fd, DMX_SET_SOURCE, &n);
 	::close(fd);
 	return res;
+#endif
+	return 0;
 }
 
 RESULT eDVBDemux::createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)
@@ -86,7 +108,7 @@ RESULT eDVBDemux::getMPEGDecoder(ePtr<iTSMPEGDecoder> &decoder)
 	return 0;
 }
 
-RESULT eDVBDemux::getSTC(pts_t &pts)
+RESULT eDVBDemux::getSTC(pts_t &pts, int num)
 {
 	int fd = openDemux();
 	
@@ -94,7 +116,7 @@ RESULT eDVBDemux::getSTC(pts_t &pts)
 		return -ENODEV;
 
 	struct dmx_stc stc;
-	stc.num = 0;
+	stc.num = num;
 	stc.base = 1;
 	
 	if (ioctl(fd, DMX_GET_STC, &stc) < 0)
@@ -396,6 +418,7 @@ RESULT eDVBTSRecorder::startPID(int pid)
 
 void eDVBTSRecorder::stopPID(int pid)
 {
-	::close(m_pids[pid]);
+	if (m_pids[pid] != -1)
+		::close(m_pids[pid]);
 	m_pids[pid] = -1;
 }