X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/aa3d1162bef321bd2d0effdafce6eb080660a7ca..33a78f65a250068a9c82707b704fb38f3a54091e:/lib/dvb/dvb.cpp diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index ea51d6a1..4f5ecf2e 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -1,12 +1,14 @@ -#include #include +#include +#include #include #include -#include +#include #include #include #include +#include DEFINE_REF(eDVBRegisteredFrontend); DEFINE_REF(eDVBRegisteredDemux); @@ -214,9 +216,9 @@ RESULT eDVBResourceManager::allocateFrontend(const eDVBChannelID &chid, ePtr &demux) { - /* find first unused demux which is on same adapter as frontend */ + /* find first unused demux which is on same adapter as frontend (or any, if PVR) */ for (eSmartPtrList::iterator i(m_demux.begin()); i != m_demux.end(); ++i) - if ((!i->m_inuse) && (i->m_adapter == fe->m_adapter)) + if ((!i->m_inuse) && ((!fe) || (i->m_adapter == fe->m_adapter))) { demux = new eDVBAllocatedDemux(i); return 0; @@ -312,9 +314,19 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr &channel) return 0; } -RESULT eDVBResourceManager::allocatePVRChannel(int caps) + +RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr &channel) { - return -1; // will nicht, mag nicht, und das interface ist auch kaputt + ePtr demux; + + if (allocateDemux(0, demux)) + return errNoDemux; + + eDVBChannel *ch; + ch = new eDVBChannel(this, 0, demux); + + channel = ch; + return 0; } RESULT eDVBResourceManager::addChannel(const eDVBChannelID &chid, eDVBChannel *ch) @@ -355,6 +367,8 @@ eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *fronte { m_frontend = frontend; m_demux = demux; + + m_pvr_thread = 0; if (m_frontend) m_frontend->get().connectStateChange(slot(*this, &eDVBChannel::frontendStateChanged), m_conn_frontendStateChanged); @@ -364,6 +378,14 @@ eDVBChannel::~eDVBChannel() { if (m_channel_id) m_mgr->removeChannel(this); + + if (m_pvr_thread) + { + m_pvr_thread->stop(); + ::close(m_pvr_fd_src); + ::close(m_pvr_fd_dst); + delete m_pvr_thread; + } } void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) @@ -484,3 +506,40 @@ RESULT eDVBChannel::getFrontend(ePtr &frontend) else return -ENODEV; } + +RESULT eDVBChannel::playFile(const char *file) +{ + ASSERT(!m_frontend); + if (m_pvr_thread) + { + m_pvr_thread->stop(); + delete m_pvr_thread; + m_pvr_thread = 0; + } + + /* DON'T EVEN THINK ABOUT FIXING THIS. FIX THE ATI SOURCES FIRST, + THEN DO A REAL FIX HERE! */ + + + /* (this codepath needs to be improved anyway.) */ + m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY); + if (m_pvr_fd_dst < 0) + { + eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); + return -ENODEV; + } + + m_pvr_fd_src = open(file, O_RDONLY); + if (m_pvr_fd_src < 0) + { + eDebug("can't open PVR m_pvr_fd_src file %s (%m)", file); + close(m_pvr_fd_dst); + return -ENOENT; + } + + m_state = state_ok; + m_stateChanged(this); + + m_pvr_thread = new eFilePushThread(); + m_pvr_thread->start(m_pvr_fd_src, m_pvr_fd_dst); +}