From e7e5b70162a6e74d7ee293495635c79660e0f7a8 Mon Sep 17 00:00:00 2001 From: ghost Date: Sun, 19 Jul 2009 17:58:47 +0200 Subject: [PATCH 1/1] fixes for /dev/misc/pvr opening problems in some conditions --- lib/dvb/dvb.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index 6b027088..894287e8 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -1124,6 +1124,7 @@ eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *fronte m_frontend = frontend; m_pvr_thread = 0; + m_pvr_fd_dst = -1; m_skipmode_n = m_skipmode_m = m_skipmode_frames = 0; @@ -1750,16 +1751,19 @@ RESULT eDVBChannel::playFile(const char *file) /* DON'T EVEN THINK ABOUT FIXING THIS. FIX THE ATI SOURCES FIRST, THEN DO A REAL FIX HERE! */ + if (m_pvr_fd_dst < 0) + { /* (this codepath needs to be improved anyway.) */ #if HAVE_DVB_API_VERSION < 3 - m_pvr_fd_dst = open("/dev/pvr", O_WRONLY); + m_pvr_fd_dst = open("/dev/pvr", O_WRONLY); #else - m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY); + m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY); #endif - if (m_pvr_fd_dst < 0) - { - eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved. - return -ENODEV; + if (m_pvr_fd_dst < 0) + { + eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved. + return -ENODEV; + } } m_pvr_thread = new eDVBChannelFilePush(); @@ -1771,6 +1775,8 @@ RESULT eDVBChannel::playFile(const char *file) { delete m_pvr_thread; m_pvr_thread = 0; + ::close(m_pvr_fd_dst); + m_pvr_fd_dst = -1; eDebug("can't open PVR file %s (%m)", file); return -ENOENT; } @@ -1787,10 +1793,11 @@ void eDVBChannel::stopFile() if (m_pvr_thread) { m_pvr_thread->stop(); - ::close(m_pvr_fd_dst); delete m_pvr_thread; m_pvr_thread = 0; } + if (m_pvr_fd_dst >= 0) + ::close(m_pvr_fd_dst); } void eDVBChannel::setCueSheet(eCueSheet *cuesheet) -- 2.30.2