Ticket #1677: dvbsiparser.diff

dvbsiparser.cpp

@@ -114 +114 @@
 
      /* Set flag so other processes can get past pollLock */
     filterChange = true;
-    pollLock.lock();
 
+    QMutexLocker locker(&pollLock);
+
     filterChange = false;
 
     PIDFDMap::Iterator it;
@@ -124 +125 @@
     {
        if (it.data().pid == pid)
        {
-          pollLock.unlock();
           return;
        }
     }
@@ -147 +147 @@
     if (fd == -1)
     {
         ERRNO(QString("Failed to open section filter (pid %1)").arg(pid));
-        pollLock.unlock();
         return;
     }
 
     if (ioctl(fd, DMX_SET_BUFFER_SIZE, sect_buf_size) < 0) {
         ERRNO(QString("Failed to set demux buffer size (pid %1)").arg(pid));
-        pollLock.unlock();
         return;
     }
 
     if (ioctl(fd, DMX_SET_FILTER, &params) < 0)
     {
         ERRNO(QString("Failed to set section filter (pid %1)").arg(pid));
-        pollLock.unlock();
         return;
     }
 
@@ -175 +172 @@
     pollArray[pollLength].revents = 0;
     pollLength++;
 
-    pollLock.unlock();
 }
 
 void DVBSIParser::DelPid(uint pid)
@@ -187 +183 @@
 
     filterChange = true;
 
-    pollLock.lock();
+    QMutexLocker locker(&pollLock);
 
     filterChange = false;
 
@@ -221 +217 @@
        x++;
     }
 
-    pollLock.unlock();
 }
 
 void DVBSIParser::DelAllPids(void)
@@ -229 +224 @@
     PIDFDMap::Iterator it;
 
     filterChange = true;
-    pollLock.lock();
+    QMutexLocker locker(&pollLock);
     filterChange = false;
 
     for (it = PIDfilterManager.begin() ; it != PIDfilterManager.end() ; ++it)
@@ -239 +234 @@
     free(pollArray);
     pollLength = 0;
     pollArray = NULL;
-
-    pollLock.unlock();
 }
 
 void DVBSIParser::StopSectionReader(void)
@@ -249 +242 @@
    exitSectionThread = true;
    DelAllPids();
    filterChange = true;
-   pollLock.lock();
+   QMutexLocker locker(&pollLock);
    filterChange = false;
    free(pollArray);
-   pollLock.unlock();
 }
 
 void DVBSIParser::StartSectionReader(void)
@@ -273 +265 @@
            usleep(250);
         processed = false;
 
-        pollLock.lock();
+        QMutexLocker locker(&pollLock);
 
         int ret = poll(pollArray, pollLength, 1000);
 
@@ -326 +318 @@
                 pollArray[i].revents = 0;
             }
         }
-
-        pollLock.unlock();
     }
 
     sectionThreadRunning = false;