summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/controllers/bulk/bulkcontroller.cpp2
-rw-r--r--src/engine/cachingreader/cachingreader.cpp2
-rw-r--r--src/engine/cachingreader/cachingreaderworker.cpp2
-rw-r--r--src/library/export/trackexportworker.cpp4
-rw-r--r--src/util/compatibility.h28
-rw-r--r--src/util/statsmanager.cpp4
-rw-r--r--src/waveform/waveform.h2
7 files changed, 8 insertions, 36 deletions
diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp
index a087d5574d..0f30ebaee1 100644
--- a/src/controllers/bulk/bulkcontroller.cpp
+++ b/src/controllers/bulk/bulkcontroller.cpp
@@ -28,7 +28,7 @@ void BulkReader::run() {
m_stop = 0;
unsigned char data[255];
- while (atomicLoadAcquire(m_stop) == 0) {
+ while (m_stop.loadAcquire() == 0) {
// Blocked polling: The only problem with this is that we can't close
// the device until the block is released, which means the controller
// has to send more data
diff --git a/src/engine/cachingreader/cachingreader.cpp b/src/engine/cachingreader/cachingreader.cpp
index 67f14e2389..5f998139bb 100644
--- a/src/engine/cachingreader/cachingreader.cpp
+++ b/src/engine/cachingreader/cachingreader.cpp
@@ -234,7 +234,7 @@ void CachingReader::process() {
update.status == CHUNK_READ_EOF ||
update.status == CHUNK_READ_INVALID ||
update.status == CHUNK_READ_DISCARDED);
- if (atomicLoadAcquire(m_state) == STATE_TRACK_LOADING) {
+ if (m_state.loadAcquire() == STATE_TRACK_LOADING) {
// Discard all results from pending read requests for the
// previous track before the next track has been loaded.
freeChunk(pChunk);
diff --git a/src/engine/cachingreader/cachingreaderworker.cpp b/src/engine/cachingreader/cachingreaderworker.cpp
index 5353b7b105..7f1ec004f0 100644
--- a/src/engine/cachingreader/cachingreaderworker.cpp
+++ b/src/engine/cachingreader/cachingreaderworker.cpp
@@ -90,7 +90,7 @@ void CachingReaderWorker::run() {
QThread::currentThread()->setObjectName(QString("CachingReaderWorker %1").arg(++id));
Event::start(m_tag);
- while (!atomicLoadAcquire(m_stop)) {
+ while (!m_stop.loadAcquire()) {
// Request is initialized by reading from FIFO
CachingReaderChunkReadRequest request;
if (m_newTrackAvailable) {
diff --git a/src/library/export/trackexportworker.cpp b/src/library/export/trackexportworker.cpp
index dd9a16f567..d0e9c5ccf8 100644
--- a/src/library/export/trackexportworker.cpp
+++ b/src/library/export/trackexportworker.cpp
@@ -81,7 +81,7 @@ void TrackExportWorker::run() {
// on the bar, which looks really nice.
emit progress(it->fileName(), i, copy_list.size());
copyFile((*it).asFileInfo(), it.key());
- if (atomicLoadAcquire(m_bStop)) {
+ if (m_bStop.loadAcquire()) {
emit canceled();
return;
}
@@ -162,7 +162,7 @@ TrackExportWorker::OverwriteAnswer TrackExportWorker::makeOverwriteRequest(
// We can be either canceled from the other thread, or as a return value
// from this call. First check for a call from the other thread.
- if (atomicLoadAcquire(m_bStop)) {
+ if (m_bStop.loadAcquire()) {
return OverwriteAnswer::CANCEL;
}
diff --git a/src/util/compatibility.h b/src/util/compatibility.h
index 08f2d83334..078f4538b8 100644
--- a/src/util/compatibility.h
+++ b/src/util/compatibility.h
@@ -129,34 +129,6 @@ inline QScreen* getPrimaryScreen() {
}
template <typename T>
-inline T atomicLoadAcquire(const QAtomicInteger<T>& atomicInt) {
- // TODO: QBasicAtomicInteger<T>::load() is deprecated and should be
- // replaced with QBasicAtomicInteger<T>::loadRelaxed() However, the
- // proposed alternative has just been introduced in Qt 5.14. Until the
- // minimum required Qt version of Mixxx is increased, we need a version
- // check here
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
- return atomicInt.loadAcquire();
-#else
- return atomicInt.load();
-#endif
-}
-
-template <typename T>
-inline T* atomicLoadAcquire(const QAtomicPointer<T>& atomicPtr) {
- // TODO: QBasicAtomicPointer<T>::load() is deprecated and should be
- // replaced with QBasicAtomicPointer<T>::loadRelaxed() However, the
- // proposed alternative has just been introduced in Qt 5.14. Until the
- // minimum required Qt version of Mixxx is increased, we need a version
- // check here
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
- return atomicPtr.loadAcquire();
-#else
- return atomicPtr.load();
-#endif
-}
-
-template <typename T>
inline T atomicLoadRelaxed(const QAtomicInteger<T>& atomicInt) {
// TODO: QBasicAtomicInteger<T>::load() is deprecated and should be
// replaced with QBasicAtomicInteger<T>::loadRelaxed() However, the
diff --git a/src/util/statsmanager.cpp b/src/util/statsmanager.cpp
index b771a2ed8c..46e8c5d017 100644
--- a/src/util/statsmanager.cpp
+++ b/src/util/statsmanager.cpp
@@ -248,7 +248,7 @@ void StatsManager::run() {
processIncomingStatReports();
m_statsPipeLock.unlock();
- if (atomicLoadAcquire(m_emitAllStats) == 1) {
+ if (m_emitAllStats.loadAcquire() == 1) {
for (auto it = m_stats.constBegin();
it != m_stats.constEnd(); ++it) {
emit statUpdated(it.value());
@@ -256,7 +256,7 @@ void StatsManager::run() {
m_emitAllStats = 0;
}
- if (atomicLoadAcquire(m_quit) == 1) {
+ if (m_quit.loadAcquire() == 1) {
qDebug() << "StatsManager thread shutting down.";
break;
}
diff --git a/src/waveform/waveform.h b/src/waveform/waveform.h
index e9df058148..c266f46332 100644
--- a/src/waveform/waveform.h
+++ b/src/waveform/waveform.h
@@ -99,7 +99,7 @@ class Waveform {
// Atomically lookup the completion of the waveform. Represents the number
// of data elements that have been processed out of dataSize.
int getCompletion() const {
- return atomicLoadAcquire(m_completion);
+ return m_completion.loadAcquire();
}
void setCompletion(int completion) {
m_completion = completion;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 03:49:35 +0000