#else
#include <linux/dvb/dmx.h>
-// #define HAVE_ADD_PID
+#define HAVE_ADD_PID
#ifdef HAVE_ADD_PID
#define DMX_ADD_PID _IO('o', 51)
return 0;
}
-RESULT eDVBDemux::getMPEGDecoder(ePtr<iTSMPEGDecoder> &decoder)
+RESULT eDVBDemux::getMPEGDecoder(ePtr<iTSMPEGDecoder> &decoder, int primary)
{
- decoder = new eTSMPEGDecoder(this, 0);
+ decoder = new eTSMPEGDecoder(this, primary ? 0 : 1);
return 0;
}
dmx_pes_filter_params flt;
flt.pes_type = (dmx_pes_type_t)DMX_TAP_TS;
- flt.pid = 0x1234; /* FIXME */
+ flt.pid = (__u16)-1;
flt.input = DMX_IN_FRONTEND;
flt.output = DMX_OUT_TAP;
flt.flags = 0;
m_thread->stop();
close(m_source_fd);
+ m_source_fd = -1;
if (m_target_filename != "")
m_thread->saveTimingInformation(m_target_filename + ".ap");
}
m_pids[pid] = fd;
#else
- eDebug("add pid: %08x", pid);
if (::ioctl(m_source_fd, DMX_ADD_PID, pid))
perror("DMX_ADD_PID");
- eDebug("ok");
+ else
+ m_pids[pid] = 1;
#endif
return 0;
}
#ifndef HAVE_ADD_PID
if (m_pids[pid] != -1)
::close(m_pids[pid]);
- m_pids[pid] = -1;
#else
- if (::ioctl(m_source_fd, DMX_REMOVE_PID, pid))
- perror("DMX_REMOVE_PID");
+ if (m_pids[pid] != -1)
+ {
+ if (::ioctl(m_source_fd, DMX_REMOVE_PID, pid))
+ perror("DMX_REMOVE_PID");
+ }
#endif
+ m_pids[pid] = -1;
}