cppcheck: Replace several obsolete usleep calls with nanosleep.

MythTV · Oct 2, 2020 · 8cc709e · 8cc709e
1 parent 5ff0f80
commit 8cc709e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/mythplugins/mythmusic/mythmusic/avfdecoder.cpp b/mythplugins/mythmusic/mythmusic/avfdecoder.cpp
@@ -507,7 +507,8 @@ void avfDecoder::run()
                 if (buffered < 1000)
                     break;
                 // wait
-                usleep((buffered - 1000) * 1000);
+                const struct timespec ns {0, (buffered - 1000) * 1000000};
+                nanosleep(&ns, nullptr);
             }
         }
     }

diff --git a/mythplugins/mythmusic/mythmusic/editmetadata.cpp b/mythplugins/mythmusic/mythmusic/editmetadata.cpp
@@ -1356,7 +1356,8 @@ void EditAlbumartDialog::doCopyImageToTag(const AlbumArtImage *image)
     while (copyThread->isRunning())
     {
         qApp->processEvents();
-        usleep(1000);
+        const struct timespec onems {0, 1000000};
+        nanosleep(&onems, nullptr);
     }
 
     strList = copyThread->getResult();

diff --git a/mythplugins/mythmusic/mythmusic/importmusic.cpp b/mythplugins/mythmusic/mythmusic/importmusic.cpp
@@ -483,7 +483,8 @@ bool ImportMusicDialog::copyFile(const QString &src, const QString &dst)
 
     while (!copy->isFinished())
     {
-        usleep(500);
+        const struct timespec halfms {0, 500000};
+        nanosleep(&halfms, nullptr);
         QCoreApplication::processEvents();
     }
 
@@ -522,7 +523,8 @@ void ImportMusicDialog::startScan()
 
     while (!scanner->isFinished())
     {
-        usleep(500);
+        const struct timespec halfms {0, 500000};
+        nanosleep(&halfms, nullptr);
         QCoreApplication::processEvents();
     }
 

diff --git a/mythplugins/mythzoneminder/mythzoneminder/alarmnotifythread.cpp b/mythplugins/mythzoneminder/mythzoneminder/alarmnotifythread.cpp
@@ -66,7 +66,8 @@ void AlarmNotifyThread::run()
             }
         }
 
-        usleep(999999);
+        const struct timespec onesec {1, 0};
+        nanosleep(&onesec, nullptr);
     }
 
     RunEpilog();

diff --git a/mythtv/libs/libmythtv/DVD/mythdvdbuffer.cpp b/mythtv/libs/libmythtv/DVD/mythdvdbuffer.cpp
@@ -500,8 +500,9 @@ void MythDVDBuffer::WaitForPlayer(void)
         int count = 0;
         while (m_playerWait && count++ < 200)
         {
+            const struct timespec tenms {0, 10000000};
             m_rwLock.unlock();
-            usleep(10000);
+            nanosleep(&tenms, nullptr);
             m_rwLock.lockForWrite();
         }
 
@@ -522,6 +523,7 @@ int MythDVDBuffer::SafeRead(void *Buffer, uint Size)
     int             offset       = 0;
     bool            reprocessing = false;
     bool            waiting      = false;
+    const struct timespec tenms {0, 10000000};
 
     if (m_gotStop)
     {
@@ -996,7 +998,7 @@ int MythDVDBuffer::SafeRead(void *Buffer, uint Size)
                         // pause a little as the dvdnav VM will continue to return
                         // this event until it has been skipped
                         m_rwLock.unlock();
-                        usleep(10000);
+                        nanosleep(&tenms, nullptr);
                         m_rwLock.lockForWrite();
 
                         // when scanning the file or exiting playback, skip immediately
@@ -1052,7 +1054,7 @@ int MythDVDBuffer::SafeRead(void *Buffer, uint Size)
                         {
                             m_dvdWaiting = true;
                             m_rwLock.unlock();
-                            usleep(10000);
+                            nanosleep(&tenms, nullptr);
                             m_rwLock.lockForWrite();
                         }