5 files changed, 23 insertions, 22 deletions

diff --git a/src/multimedia/audio/qaudiobuffer.cpp b/src/multimedia/audio/qaudiobuffer.cpp
index 1e43ebd00..999f280b3 100644
--- a/src/multimedia/audio/qaudiobuffer.cpp
+++ b/src/multimedia/audio/qaudiobuffer.cpp
@@ -164,7 +164,7 @@ QAudioBufferPrivate *QAudioBufferPrivate::clone()
     // We want to create a single bufferprivate with a
     // single qaab
     // This should only be called when the count is > 1
-    Q_ASSERT(mCount.load() > 1);
+    Q_ASSERT(mCount.loadRelaxed() > 1);
 
     if (mProvider) {
         QAbstractAudioBuffer *abuf = mProvider->clone();
@@ -458,7 +458,7 @@ void *QAudioBuffer::data()
     if (!isValid())
         return nullptr;
 
-    if (d->mCount.load() != 1) {
+    if (d->mCount.loadRelaxed() != 1) {
         // Can't share a writable buffer
         // so we need to detach
         QAudioBufferPrivate *newd = d->clone();
@@ -483,7 +483,7 @@ void *QAudioBuffer::data()
 
     if (memBuffer) {
         d->mProvider->release();
-        d->mCount.store(1);
+        d->mCount.storeRelaxed(1);
         d->mProvider = memBuffer;
 
         return memBuffer->writableData();
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index b8cac18eb..051ef8b3f 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo.cpp
@@ -328,16 +328,12 @@ QAudioFormat QAudioDeviceInfo::nearestFormat(const QAudioFormat &settings) const
             nearest.setByteOrder(order);
             for (QAudioFormat::SampleType sample : qAsConst(testSampleTypes)) {
                 nearest.setSampleType(sample);
-                QMapIterator<int, int> sz(testSampleSizes);
-                while (sz.hasNext()) {
-                    sz.next();
-                    nearest.setSampleSize(sz.value());
+                for (int sampleSize : qAsConst(testSampleSizes)) {
+                    nearest.setSampleSize(sampleSize);
                     for (int channel : qAsConst(testChannels)) {
                         nearest.setChannelCount(channel);
-                        QMapIterator<int, int> i(testSampleRates);
-                        while (i.hasNext()) {
-                            i.next();
-                            nearest.setSampleRate(i.value());
+                        for (int sampleRate : qAsConst(testSampleRates)) {
+                            nearest.setSampleRate(sampleRate);
                             if (isFormatSupported(nearest))
                                 return nearest;
                         }
@@ -449,7 +445,10 @@ QAudioDeviceInfo::QAudioDeviceInfo(const QString &realm, const QByteArray &handl
 }
 
 /*!
-    \internal
+    Returns the key that represents the audio plugin.
+
+    \since 5.14
+    \sa QAudioSystemPlugin
 */
 QString QAudioDeviceInfo::realm() const
 {
diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodeviceinfo.h
index 390458b39..015c8bad7 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.h
+++ b/src/multimedia/audio/qaudiodeviceinfo.h
@@ -87,6 +87,7 @@ public:
     QList<int> supportedSampleSizes() const;
     QList<QAudioFormat::Endian> supportedByteOrders() const;
     QList<QAudioFormat::SampleType> supportedSampleTypes() const;
+    QString realm() const;
 
     static QAudioDeviceInfo defaultInputDevice();
     static QAudioDeviceInfo defaultOutputDevice();
@@ -95,7 +96,6 @@ public:
 
 private:
     QAudioDeviceInfo(const QString &realm, const QByteArray &handle, QAudio::Mode mode);
-    QString realm() const;
     QByteArray handle() const;
     QAudio::Mode mode() const;
 
diff --git a/src/multimedia/audio/qsamplecache_p.cpp b/src/multimedia/audio/qsamplecache_p.cpp
index 35234f8bb..8c4fdc210 100644
--- a/src/multimedia/audio/qsamplecache_p.cpp
+++ b/src/multimedia/audio/qsamplecache_p.cpp
@@ -47,6 +47,8 @@
 #include <QtCore/QDebug>
 //#define QT_SAMPLECACHE_DEBUG
 
+#include <mutex>
+
 QT_BEGIN_NAMESPACE
 
 
@@ -98,7 +100,6 @@ QT_BEGIN_NAMESPACE
 QSampleCache::QSampleCache(QObject *parent)
     : QObject(parent)
     , m_networkAccessManager(nullptr)
-    , m_mutex(QMutex::Recursive)
     , m_capacity(0)
     , m_usage(0)
     , m_loadingRefCount(0)
@@ -117,7 +118,7 @@ QNetworkAccessManager& QSampleCache::networkAccessManager()
 
 QSampleCache::~QSampleCache()
 {
-    QMutexLocker m(&m_mutex);
+    const std::lock_guard<QRecursiveMutex> locker(m_mutex);
 
     m_loadingThread.quit();
     m_loadingThread.wait();
@@ -157,7 +158,7 @@ bool QSampleCache::isLoading() const
 
 bool QSampleCache::isCached(const QUrl &url) const
 {
-    QMutexLocker locker(&m_mutex);
+    const std::lock_guard<QRecursiveMutex> locker(m_mutex);
     return m_samples.contains(url);
 }
 
@@ -174,7 +175,7 @@ QSample* QSampleCache::requestSample(const QUrl& url)
 #ifdef QT_SAMPLECACHE_DEBUG
     qDebug() << "QSampleCache: request sample [" << url << "]";
 #endif
-    QMutexLocker locker(&m_mutex);
+    std::unique_lock<QRecursiveMutex> locker(m_mutex);
     QMap<QUrl, QSample*>::iterator it = m_samples.find(url);
     QSample* sample;
     if (it == m_samples.end()) {
@@ -194,7 +195,7 @@ QSample* QSampleCache::requestSample(const QUrl& url)
 
 void QSampleCache::setCapacity(qint64 capacity)
 {
-    QMutexLocker locker(&m_mutex);
+    const std::lock_guard<QRecursiveMutex> locker(m_mutex);
     if (m_capacity == capacity)
         return;
 #ifdef QT_SAMPLECACHE_DEBUG
@@ -227,7 +228,7 @@ void QSampleCache::unloadSample(QSample *sample)
 // Called in both threads
 void QSampleCache::refresh(qint64 usageChange)
 {
-    QMutexLocker locker(&m_mutex);
+    const std::lock_guard<QRecursiveMutex> locker(m_mutex);
     m_usage += usageChange;
     if (m_capacity <= 0 || m_usage <= m_capacity)
         return;
@@ -265,7 +266,7 @@ void QSampleCache::refresh(qint64 usageChange)
 // Called in both threads
 void QSampleCache::removeUnreferencedSample(QSample *sample)
 {
-    QMutexLocker m(&m_mutex);
+    const std::lock_guard<QRecursiveMutex> locker(m_mutex);
     m_staleSamples.remove(sample);
 }
 
@@ -301,7 +302,8 @@ bool QSampleCache::notifyUnreferencedSample(QSample* sample)
     if (m_loadingThread.isRunning())
         m_loadingThread.wait();
 
-    QMutexLocker locker(&m_mutex);
+    const std::lock_guard<QRecursiveMutex> locker(m_mutex);
+
     if (m_capacity > 0)
         return false;
     m_samples.remove(sample->m_url);
diff --git a/src/multimedia/audio/qsamplecache_p.h b/src/multimedia/audio/qsamplecache_p.h
index 094e3281e..4c2384743 100644
--- a/src/multimedia/audio/qsamplecache_p.h
+++ b/src/multimedia/audio/qsamplecache_p.h
@@ -143,7 +143,7 @@ private:
     QMap<QUrl, QSample*> m_samples;
     QSet<QSample*> m_staleSamples;
     QNetworkAccessManager *m_networkAccessManager;
-    mutable QMutex m_mutex;
+    mutable QRecursiveMutex m_mutex;
     qint64 m_capacity;
     qint64 m_usage;
     QThread m_loadingThread;