Merge pull request #4589 from daschuer/sleep

Dispose sleep() workarounds for QT4
mixxxdj · Dec 29, 2021 · 1daa7c6 · 1daa7c6
2 parents e3062a1 + 99e8ca0
commit 1daa7c6
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 44 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -898,7 +898,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/util/semanticversion.cpp
   src/util/screensaver.cpp
   src/util/screensavermanager.cpp
-  src/util/sleepableqthread.cpp
   src/util/stat.cpp
   src/util/statmodel.cpp
   src/util/statsmanager.cpp

diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
@@ -21,7 +21,6 @@
 #include "util/compatibility/qatomic.h"
 #include "util/defs.h"
 #include "util/logger.h"
-#include "util/sleepableqthread.h"
 
 namespace {
 

diff --git a/src/soundio/soundmanager.cpp b/src/soundio/soundmanager.cpp
@@ -3,6 +3,7 @@
 #include <portaudio.h>
 
 #include <QLibrary>
+#include <QThread>
 #include <QtDebug>
 #include <cstring> // for memcpy and strcmp
 
@@ -22,7 +23,6 @@
 #include "util/compatibility/qatomic.h"
 #include "util/defs.h"
 #include "util/sample.h"
-#include "util/sleep.h"
 #include "util/versionstore.h"
 #include "vinylcontrol/defs_vinylcontrol.h"
 
@@ -165,7 +165,7 @@ void SoundManager::closeDevices(bool sleepAfterClosing) {
 #ifdef __LINUX__
         // Sleep for 5 sec to allow asynchronously sound APIs like "pulse" to free
         // its resources as well
-        sleep(kSleepSecondsAfterClosingDevice);
+        QThread::sleep(kSleepSecondsAfterClosingDevice);
 #endif
     }
 

diff --git a/src/util/sleep.h b/src/util/sleep.h
diff --git a/src/util/sleepableqthread.cpp b/src/util/sleepableqthread.cpp
diff --git a/src/util/sleepableqthread.h b/src/util/sleepableqthread.h