diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-04-28 23:21:05 +0200 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-04-29 00:29:25 +0200 |
| commit | 5a2b9922078a767f5471d805a8ff6c756ba4ff97 (patch) | |
| tree | 3a587b2d02d573636ebe8d73750df42d7d1a1e6b /src/vinylcontrol | |
| parent | ac6f05cf94c6f6dd09f228dd46e133f1d7db9003 (diff) | |
Replace recursive QMutexes with QRecursiveMutex
Recursive QMutexes have been deprecated since the 5.15.
Fixes warnings like these:
src/vinylcontrol/vinylcontrolprocessor.cpp: In constructor ‘VinylControlProcessor::VinylControlProcessor(QObject*, UserSettingsPointer)’:
src/vinylcontrol/vinylcontrolprocessor.cpp:28:32: error: ‘QMutex::QMutex(QMutex::RecursionMode)’ is deprecated: Use QRecursiveMutex instead of a recursive QMutex [-Werror=deprecated-declarations]
28 | m_bReloadConfig(false) {
| ^
In file included from /usr/include/qt/QtCore/QMutex:1,
from src/vinylcontrol/vinylcontrolprocessor.h:6,
from src/vinylcontrol/vinylcontrolprocessor.cpp:1:
/usr/include/qt/QtCore/qmutex.h:140:14: note: declared here
140 | explicit QMutex(RecursionMode mode);
| ^~~~~~
Diffstat (limited to 'src/vinylcontrol')
| -rw-r--r-- | src/vinylcontrol/vinylcontrolprocessor.cpp | 2 | ||||
| -rw-r--r-- | src/vinylcontrol/vinylcontrolprocessor.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/vinylcontrol/vinylcontrolprocessor.cpp b/src/vinylcontrol/vinylcontrolprocessor.cpp index 9c4825bb5d..742507142c 100644 --- a/src/vinylcontrol/vinylcontrolprocessor.cpp +++ b/src/vinylcontrol/vinylcontrolprocessor.cpp @@ -20,7 +20,9 @@ VinylControlProcessor::VinylControlProcessor(QObject* pParent, UserSettingsPoint m_pConfig(pConfig), m_pToggle(new ControlPushButton(ConfigKey(VINYL_PREF_KEY, "Toggle"))), m_pWorkBuffer(SampleUtil::alloc(MAX_BUFFER_LEN)), +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) m_processorsLock(QMutex::Recursive), +#endif m_processors(kMaximumVinylControlInputs, NULL), m_signalQualityFifo(SIGNAL_QUALITY_FIFO_SIZE), m_bReportSignalQuality(false), diff --git a/src/vinylcontrol/vinylcontrolprocessor.h b/src/vinylcontrol/vinylcontrolprocessor.h index 5666db0af7..91673109f3 100644 --- a/src/vinylcontrol/vinylcontrolprocessor.h +++ b/src/vinylcontrol/vinylcontrolprocessor.h @@ -72,7 +72,11 @@ class VinylControlProcessor : public QThread, public AudioDestination { CSAMPLE* m_pWorkBuffer; QWaitCondition m_samplesAvailableSignal; QMutex m_waitForSampleMutex; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QRecursiveMutex m_processorsLock; +#else QMutex m_processorsLock; +#endif QVector<VinylControl*> m_processors; FIFO<VinylSignalQualityReport> m_signalQualityFifo; volatile bool m_bReportSignalQuality; |