summaryrefslogtreecommitdiffstats
path: root/src/mixer
diff options
context:
space:
mode:
Diffstat (limited to 'src/mixer')
-rw-r--r--src/mixer/playerinfo.cpp13
-rw-r--r--src/mixer/playermanager.cpp45
-rw-r--r--src/mixer/playermanager.h7
3 files changed, 30 insertions, 35 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;
diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
index cce731dbaa..a3340cd210 100644
--- a/src/mixer/playermanager.cpp
+++ b/src/mixer/playermanager.cpp
@@ -43,10 +43,7 @@ PlayerManager::PlayerManager(UserSettingsPointer pConfig,
SoundManager* pSoundManager,
EffectsManager* pEffectsManager,
EngineMaster* pEngine)
- :
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
- m_mutex(QMutex::Recursive),
-#endif
+ : m_mutex(QT_RECURSIVE_MUTEX_INIT),
m_pConfig(pConfig),
m_pSoundManager(pSoundManager),
m_pEffectsManager(pEffectsManager),
@@ -84,7 +81,7 @@ PlayerManager::PlayerManager(UserSettingsPointer pConfig,
PlayerManager::~PlayerManager() {
kLogger.debug() << "Destroying";
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
m_pSamplerBank->saveSamplerBankToPath(
m_pConfig->getSettingsPath() + "/samplers.xml");
@@ -113,7 +110,7 @@ PlayerManager::~PlayerManager() {
}
void PlayerManager::bindToLibrary(Library* pLibrary) {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
connect(pLibrary, &Library::loadTrackToPlayer, this, &PlayerManager::slotLoadTrackToPlayer);
connect(pLibrary,
&Library::loadTrack,
@@ -279,7 +276,7 @@ unsigned int PlayerManager::numPreviewDecks() {
}
void PlayerManager::slotChangeNumDecks(double v) {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
int num = (int)v;
VERIFY_OR_DEBUG_ASSERT(num <= kMaxNumberOfDecks) {
@@ -309,7 +306,7 @@ void PlayerManager::slotChangeNumDecks(double v) {
}
void PlayerManager::slotChangeNumSamplers(double v) {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
int num = (int)v;
if (num < m_samplers.size()) {
// The request was invalid -- don't set the value.
@@ -324,7 +321,7 @@ void PlayerManager::slotChangeNumSamplers(double v) {
}
void PlayerManager::slotChangeNumPreviewDecks(double v) {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
int num = (int)v;
if (num < m_previewDecks.size()) {
// The request was invalid -- don't set the value.
@@ -338,7 +335,7 @@ void PlayerManager::slotChangeNumPreviewDecks(double v) {
}
void PlayerManager::slotChangeNumMicrophones(double v) {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
int num = (int)v;
if (num < m_microphones.size()) {
// The request was invalid -- don't set the value.
@@ -352,7 +349,7 @@ void PlayerManager::slotChangeNumMicrophones(double v) {
}
void PlayerManager::slotChangeNumAuxiliaries(double v) {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
int num = (int)v;
if (num < m_auxiliaries.size()) {
// The request was invalid -- don't set the value.
@@ -366,7 +363,7 @@ void PlayerManager::slotChangeNumAuxiliaries(double v) {
}
void PlayerManager::addDeck() {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
double count = m_pCONumDecks->get() + 1;
slotChangeNumDecks(count);
}
@@ -446,7 +443,7 @@ void PlayerManager::loadSamplers() {
}
void PlayerManager::addSampler() {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
double count = m_pCONumSamplers->get() + 1;
slotChangeNumSamplers(count);
}
@@ -480,7 +477,7 @@ void PlayerManager::addSamplerInner() {
}
void PlayerManager::addPreviewDeck() {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
slotChangeNumPreviewDecks(m_pCONumPreviewDecks->get() + 1);
}
@@ -513,7 +510,7 @@ void PlayerManager::addPreviewDeckInner() {
}
void PlayerManager::addMicrophone() {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
slotChangeNumMicrophones(m_pCONumMicrophones->get() + 1);
}
@@ -535,7 +532,7 @@ void PlayerManager::addMicrophoneInner() {
}
void PlayerManager::addAuxiliary() {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
slotChangeNumAuxiliaries(m_pCONumAuxiliaries->get() + 1);
}
@@ -558,7 +555,7 @@ BaseTrackPlayer* PlayerManager::getPlayer(const QString& group) const {
}
BaseTrackPlayer* PlayerManager::getPlayer(const ChannelHandle& handle) const {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
if (m_players.contains(handle)) {
return m_players[handle];
@@ -567,7 +564,7 @@ BaseTrackPlayer* PlayerManager::getPlayer(const ChannelHandle& handle) const {
}
Deck* PlayerManager::getDeck(unsigned int deck) const {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
VERIFY_OR_DEBUG_ASSERT(deck > 0 && deck <= numDecks()) {
qWarning() << "getDeck() called with invalid number:" << deck;
return nullptr;
@@ -576,7 +573,7 @@ Deck* PlayerManager::getDeck(unsigned int deck) const {
}
PreviewDeck* PlayerManager::getPreviewDeck(unsigned int libPreviewPlayer) const {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
if (libPreviewPlayer < 1 || libPreviewPlayer > numPreviewDecks()) {
kLogger.warning() << "Warning getPreviewDeck() called with invalid index: "
<< libPreviewPlayer;
@@ -586,7 +583,7 @@ PreviewDeck* PlayerManager::getPreviewDeck(unsigned int libPreviewPlayer) const
}
Sampler* PlayerManager::getSampler(unsigned int sampler) const {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
if (sampler < 1 || sampler > numSamplers()) {
kLogger.warning() << "Warning getSampler() called with invalid index: "
<< sampler;
@@ -596,7 +593,7 @@ Sampler* PlayerManager::getSampler(unsigned int sampler) const {
}
Microphone* PlayerManager::getMicrophone(unsigned int microphone) const {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
if (microphone < 1 || microphone >= static_cast<unsigned int>(m_microphones.size())) {
kLogger.warning() << "Warning getMicrophone() called with invalid index: "
<< microphone;
@@ -606,7 +603,7 @@ Microphone* PlayerManager::getMicrophone(unsigned int microphone) const {
}
Auxiliary* PlayerManager::getAuxiliary(unsigned int auxiliary) const {
- QMutexLocker locker(&m_mutex);
+ const auto locker = lockMutex(&m_mutex);
if (auxiliary < 1 || auxiliary > static_cast<unsigned int>(m_auxiliaries.size())) {
kLogger.warning() << "Warning getAuxiliary() called with invalid index: "
<< auxiliary;
@@ -685,7 +682,7 @@ void PlayerManager::slotLoadToSampler(const QString& location, int sampler) {
}
void PlayerManager::slotLoadTrackIntoNextAvailableDeck(TrackPointer pTrack) {
- QMutexLocker locker(&m_mutex);
+ auto locker = lockMutex(&m_mutex);
QList<Deck*>::iterator it = m_decks.begin();
while (it != m_decks.end()) {
Deck* pDeck = *it;
@@ -704,7 +701,7 @@ void PlayerManager::slotLoadTrackIntoNextAvailableDeck(TrackPointer pTrack) {
}
void PlayerManager::slotLoadTrackIntoNextAvailableSampler(TrackPointer pTrack) {
- QMutexLocker locker(&m_mutex);
+ auto locker = lockMutex(&m_mutex);
QList<Sampler*>::iterator it = m_samplers.begin();
while (it != m_samplers.end()) {
Sampler* pSampler = *it;
diff --git a/src/mixer/playermanager.h b/src/mixer/playermanager.h
index 661579e0ca..f1bba67615 100644
--- a/src/mixer/playermanager.h
+++ b/src/mixer/playermanager.h
@@ -11,6 +11,7 @@
#include "track/track_decl.h"
#include "util/parented_ptr.h"
#include "util/performancetimer.h"
+#include "util/qtmutex.h"
class Auxiliary;
class BaseTrackPlayer;
@@ -251,11 +252,7 @@ class PlayerManager : public QObject, public PlayerManagerInterface {
void addAuxiliaryInner();
// Used to protect access to PlayerManager state across threads.
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
- mutable QRecursiveMutex m_mutex;
-#else
- mutable QMutex m_mutex;
-#endif
+ mutable QT_RECURSIVE_MUTEX m_mutex;
PerformanceTimer m_cloneTimer;
QString m_lastLoadedPlayer;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-07 07:44:40 +0000