Merge branch 'master' into dvd_scale_test

[enigma2.git] / lib / dvb / demux.cpp

diff --git a/lib/dvb/demux.cpp b/lib/dvb/demux.cpp
index 931c6c71fa8ac26220eba3bba3e2a0e32dec3cf6..a0f1c326a9522f768afa375a2a92dbb37194ba5b 100644 (file)
--- a/lib/dvb/demux.cpp
+++ b/lib/dvb/demux.cpp
@@ -76,11 +76,12 @@ RESULT eDVBDemux::setSourceFrontend(int fenum)
 {
 #if HAVE_DVB_API_VERSION >= 3
        int fd = openDemux();
-       
        int n = DMX_SOURCE_FRONT0 + fenum;
        int res = ::ioctl(fd, DMX_SET_SOURCE, &n);
        if (res)
                eDebug("DMX_SET_SOURCE failed! - %m");
+       else
+               source = fenum;
        ::close(fd);
        return res;
 #endif
@@ -93,6 +94,7 @@ RESULT eDVBDemux::setSourcePVR(int pvrnum)
        int fd = openDemux();
        int n = DMX_SOURCE_DVR0 + pvrnum;
        int res = ::ioctl(fd, DMX_SET_SOURCE, &n);
+       source = -1;
        ::close(fd);
        return res;
 #endif
@@ -204,7 +206,7 @@ eDVBSectionReader::eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESUL
        
        if (fd >= 0)
        {
-               notifier=new eSocketNotifier(context, fd, eSocketNotifier::Read, false);
+               notifier=eSocketNotifier::create(context, fd, eSocketNotifier::Read, false);
                CONNECT(notifier->activated, eDVBSectionReader::data);
                res = 0;
        } else
@@ -218,8 +220,6 @@ DEFINE_REF(eDVBSectionReader)
 
 eDVBSectionReader::~eDVBSectionReader()
 {
-       if (notifier)
-               delete notifier;
        if (fd >= 0)
                ::close(fd);
 }
@@ -329,7 +329,7 @@ eDVBPESReader::eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res):
        {
                ::ioctl(m_fd, DMX_SET_BUFFER_SIZE, 64*1024);
                ::fcntl(m_fd, F_SETFL, O_NONBLOCK);
-               m_notifier = new eSocketNotifier(context, m_fd, eSocketNotifier::Read, false);
+               m_notifier = eSocketNotifier::create(context, m_fd, eSocketNotifier::Read, false);
                CONNECT(m_notifier->activated, eDVBPESReader::data);
                res = 0;
        } else
@@ -343,8 +343,6 @@ DEFINE_REF(eDVBPESReader)
 
 eDVBPESReader::~eDVBPESReader()
 {
-       if (m_notifier)
-               delete m_notifier;
        if (m_fd >= 0)
                ::close(m_fd);
 }
@@ -632,10 +630,17 @@ RESULT eDVBTSRecorder::startPID(int pid)
        }
        m_pids[pid] = fd;
 #else
-       if (::ioctl(m_source_fd, DMX_ADD_PID, pid))
-               perror("DMX_ADD_PID");
-       else
-               m_pids[pid] = 1;
+       while(true) {
+               if (::ioctl(m_source_fd, DMX_ADD_PID, pid) < 0) {
+                       perror("DMX_ADD_PID");
+                       if (errno == EAGAIN || errno == EINTR) {
+                               eDebug("retry!");
+                               continue;
+                       }
+               } else
+                       m_pids[pid] = 1;
+               break;
+       }
 #endif
        return 0;
 }
@@ -648,8 +653,16 @@ void eDVBTSRecorder::stopPID(int pid)
 #else
        if (m_pids[pid] != -1)
        {
-               if (::ioctl(m_source_fd, DMX_REMOVE_PID, pid))
-                       perror("DMX_REMOVE_PID");
+               while(true) {
+                       if (::ioctl(m_source_fd, DMX_REMOVE_PID, pid) < 0) {
+                               perror("DMX_REMOVE_PID");
+                               if (errno == EAGAIN || errno == EINTR) {
+                                       eDebug("retry!");
+                                       continue;
+                               }
+                       }
+                       break;
+               }
        }
 #endif
        m_pids[pid] = -1;