diff options
author | Be <be@mixxx.org> | 2021-09-17 14:06:27 -0500 |
---|---|---|
committer | Be <be@mixxx.org> | 2021-09-17 14:16:36 -0500 |
commit | 44170cc85cc2ff4298265a58e07ef2d9004a4c3d (patch) | |
tree | 4edc7e50591e184c9e30278fb95fa98cf611df8a /src/mixer/playerinfo.cpp | |
parent | 62daaf7f845d0084a44d4b57eacdfe486c81438a (diff) |
use Qt5/6 QMutex & QMutexLocker compatibility macros
Diffstat (limited to 'src/mixer/playerinfo.cpp')
-rw-r--r-- | src/mixer/playerinfo.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mixer/playerinfo.cpp b/src/mixer/playerinfo.cpp index 8d0aa4a31a..3b8085e2dd 100644 --- a/src/mixer/playerinfo.cpp +++ b/src/mixer/playerinfo.cpp @@ -9,6 +9,7 @@ #include "mixer/playermanager.h" #include "moc_playerinfo.cpp" #include "track/track.h" +#include "util/qtmutex.h" namespace { @@ -52,14 +53,14 @@ void PlayerInfo::destroy() { } TrackPointer PlayerInfo::getTrackInfo(const QString& group) { - QMutexLocker locker(&m_mutex); + const auto locker = lockMutex(&m_mutex); return m_loadedTrackMap.value(group); } void PlayerInfo::setTrackInfo(const QString& group, const TrackPointer& pTrack) { TrackPointer pOld; { // Scope - QMutexLocker locker(&m_mutex); + const auto locker = lockMutex(&m_mutex); pOld = m_loadedTrackMap.value(group); m_loadedTrackMap.insert(group, pTrack); } @@ -77,7 +78,7 @@ void PlayerInfo::setTrackInfo(const QString& group, const TrackPointer& pTrack) } bool PlayerInfo::isTrackLoaded(const TrackPointer& pTrack) const { - QMutexLocker locker(&m_mutex); + const auto locker = lockMutex(&m_mutex); QMapIterator<QString, TrackPointer> it(m_loadedTrackMap); while (it.hasNext()) { it.next(); @@ -89,13 +90,13 @@ bool PlayerInfo::isTrackLoaded(const TrackPointer& pTrack) const { } QMap<QString, TrackPointer> PlayerInfo::getLoadedTracks() { - QMutexLocker locker(&m_mutex); + const auto locker = lockMutex(&m_mutex); QMap<QString, TrackPointer> ret = m_loadedTrackMap; return ret; } bool PlayerInfo::isFileLoaded(const QString& track_location) const { - QMutexLocker locker(&m_mutex); + const auto locker = lockMutex(&m_mutex); QMapIterator<QString, TrackPointer> it(m_loadedTrackMap); while (it.hasNext()) { it.next(); @@ -115,7 +116,7 @@ void PlayerInfo::timerEvent(QTimerEvent* pTimerEvent) { } void PlayerInfo::updateCurrentPlayingDeck() { - QMutexLocker locker(&m_mutex); + auto locker = lockMutex(&m_mutex); double maxVolume = 0; int maxDeck = -1; |