#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
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)
return 0;
}
-RESULT eDVBDemux::getSTC(pts_t &pts)
+RESULT eDVBDemux::getSTC(pts_t &pts, int num)
{
int fd = openDemux();
return -ENODEV;
struct dmx_stc stc;
- stc.num = 0;
+ stc.num = num;
stc.base = 1;
if (ioctl(fd, DMX_GET_STC, &stc) < 0)
void eDVBTSRecorder::stopPID(int pid)
{
- ::close(m_pids[pid]);
+ if (m_pids[pid] != -1)
+ ::close(m_pids[pid]);
m_pids[pid] = -1;
}