summaryrefslogtreecommitdiffstats
path: root/src/track
diff options
context:
space:
mode:
Diffstat (limited to 'src/track')
-rw-r--r--src/track/cue.cpp41
-rw-r--r--src/track/keyutils.cpp12
-rw-r--r--src/track/track.cpp4
3 files changed, 30 insertions, 27 deletions
diff --git a/src/track/cue.cpp b/src/track/cue.cpp
index 74c7e52148..9b50216ec3 100644
--- a/src/track/cue.cpp
+++ b/src/track/cue.cpp
@@ -9,6 +9,7 @@
#include "util/assert.h"
#include "util/color/color.h"
#include "util/color/predefinedcolorpalettes.h"
+#include "util/qtmutex.h"
namespace {
@@ -111,7 +112,7 @@ Cue::Cue(
mixxx::CueInfo Cue::getCueInfo(
mixxx::audio::SampleRate sampleRate) const {
- QMutexLocker lock(&m_mutex);
+ const auto lock = lockMutex(&m_mutex);
return mixxx::CueInfo(
m_type,
positionFramesToMillis(m_startPosition, sampleRate),
@@ -122,12 +123,12 @@ mixxx::CueInfo Cue::getCueInfo(
}
DbId Cue::getId() const {
- QMutexLocker lock(&m_mutex);
+ const auto lock = lockMutex(&m_mutex);
return m_dbId;
}
void Cue::setId(DbId cueId) {
- QMutexLocker lock(&m_mutex);
+ const auto lock = lockMutex(&m_mutex);
m_dbId = cueId;
// Neither mark as dirty nor do emit the updated() signal.
// This function is only called after adding the Cue object
@@ -138,12 +139,12 @@ void Cue::setId(DbId cueId) {
}
mixxx::CueType Cue::getType() const {
- QMutexLocker lock(&m_mutex);
+ const auto lock = lockMutex(&m_mutex);
return m_type;
}
void Cue::setType(mixxx::CueType type) {
- QMutexLocker lock(&m_mutex);
+ auto lock = lockMutex(&m_mutex);
if (m_type == type) {
return;
}
@@ -154,12 +155,12 @@ void Cue::setType(mixxx::CueType type) {
}
mixxx::audio::FramePos Cue::getPosition() const {
- QMutexLocker lock(&m_mutex);
+ const auto lock = lockMutex(&m_mutex);
return m_startPosition;
}
void Cue::setStartPosition(mixxx::audio::FramePos position) {
- QMutexLocker lock(&m_mutex);
+ auto lock = lockMutex(&m_mutex);
if (m_startPosition == position) {
return;
}
@@ -170,7 +171,7 @@ void Cue::setStartPosition(mixxx::audio::FramePos position) {
}
void Cue::setEndPosition(mixxx::audio::FramePos position) {
- QMutexLocker lock(&m_mutex);
+ auto lock = lockMutex(&m_mutex);
if (m_endPosition == position) {
return;
}
@@ -183,7 +184,7 @@ void Cue::setEndPosition(mixxx::audio::FramePos position) {
void Cue::setStartAndEndPosition(
mixxx::audio::FramePos startPosition,
mixxx::audio::FramePos endPosition) {
- QMutexLocker lock(&m_mutex);
+ auto lock = lockMutex(&m_mutex);
if (m_startPosition == startPosition &&
m_endPosition == endPosition) {
return;
@@ -196,12 +197,12 @@ void Cue::setStartAndEndPosition(
}
Cue::StartAndEndPositions Cue::getStartAndEndPosition() const {
- QMutexLocker lock(&m_mutex);
+ const auto lock = lockMutex(&m_mutex);
return {m_startPosition, m_endPosition};
}
void Cue::shiftPositionFrames(mixxx::audio::FrameDiff_t frameOffset) {
- QMutexLocker lock(&m_mutex);
+ auto lock = lockMutex(&m_mutex);
if (m_startPosition.isValid()) {
m_startPosition += frameOffset;
}
@@ -214,7 +215,7 @@ void Cue::shiftPositionFrames(mixxx::audio::FrameDiff_t frameOffset) {
}
mixxx::audio::FrameDiff_t Cue::getLengthFrames() const {
- QMutexLocker lock(&m_mutex);
+ const auto lock = lockMutex(&m_mutex);
if (!m_endPosition.isValid()) {
return 0;
}
@@ -225,17 +226,17 @@ mixxx::audio::FrameDiff_t Cue::getLengthFrames() const {
}
int Cue::getHotCue() const {
- QMutexLocker lock(&m_mutex);
+ const auto lock = lockMutex(&m_mutex);
return m_iHotCue;
}
QString Cue::getLabel() const {
- QMutexLocker lock(&m_mutex);
+ const auto lock = lockMutex(&m_mutex);
return m_label;
}
void Cue::setLabel(const QString& label) {
- QMutexLocker lock(&m_mutex);
+ auto lock = lockMutex(&m_mutex);
if (m_label == label) {
return;
}
@@ -246,12 +247,12 @@ void Cue::setLabel(const QString& label) {
}
mixxx::RgbColor Cue::getColor() const {
- QMutexLocker lock(&m_mutex);
+ const auto lock = lockMutex(&m_mutex);
return m_color;
}
void Cue::setColor(mixxx::RgbColor color) {
- QMutexLocker lock(&m_mutex);
+ auto lock = lockMutex(&m_mutex);
if (m_color == color) {
return;
}
@@ -262,16 +263,16 @@ void Cue::setColor(mixxx::RgbColor color) {
}
bool Cue::isDirty() const {
- QMutexLocker lock(&m_mutex);
+ const auto lock = lockMutex(&m_mutex);
return m_bDirty;
}
void Cue::setDirty(bool dirty) {
- QMutexLocker lock(&m_mutex);
+ const auto lock = lockMutex(&m_mutex);
m_bDirty = dirty;
}
mixxx::audio::FramePos Cue::getEndPosition() const {
- QMutexLocker lock(&m_mutex);
+ const auto lock = lockMutex(&m_mutex);
return m_endPosition;
}
diff --git a/src/track/keyutils.cpp b/src/track/keyutils.cpp
index 595ed75c18..6189d3bb12 100644
--- a/src/track/keyutils.cpp
+++ b/src/track/keyutils.cpp
@@ -1,11 +1,13 @@
-#include <QtDebug>
+#include "track/keyutils.h"
+
#include <QMap>
#include <QMutexLocker>
#include <QPair>
#include <QRegExp>
+#include <QtDebug>
-#include "track/keyutils.h"
#include "util/math.h"
+#include "util/qtmutex.h"
#define MUSIC_FLAT_UTF8 "\xe299ad"
#define MUSIC_SHARP_UTF8 "\xe299af"
@@ -182,7 +184,7 @@ QString KeyUtils::keyDebugName(ChromaticKey key) {
// static
void KeyUtils::setNotation(const QMap<ChromaticKey, QString>& notation) {
- QMutexLocker locker(&s_notationMutex);
+ const auto locker = lockMutex(&s_notationMutex);
s_notation = notation;
s_reverseNotation.clear();
@@ -206,7 +208,7 @@ QString KeyUtils::keyToString(ChromaticKey key,
if (notation == KeyNotation::Custom) {
// The default value for notation is KeyUtils::KeyNotation::Custom, so this executes when the function is
// called without a notation specified after KeyUtils::setNotation has set up s_notation.
- QMutexLocker locker(&s_notationMutex);
+ const auto locker = lockMutex(&s_notationMutex);
auto it = s_notation.constFind(key);
if (it != s_notation.constEnd()) {
return it.value();
@@ -255,7 +257,7 @@ ChromaticKey KeyUtils::guessKeyFromText(const QString& text) {
// Try using the user's custom notation.
{
- QMutexLocker locker(&s_notationMutex);
+ const auto locker = lockMutex(&s_notationMutex);
auto it = s_reverseNotation.constFind(text);
if (it != s_reverseNotation.constEnd()) {
return it.value();
diff --git a/src/track/track.cpp b/src/track/track.cpp
index d99c36f35a..44ce41fc1c 100644
--- a/src/track/track.cpp
+++ b/src/track/track.cpp
@@ -327,11 +327,11 @@ void Track::setReplayGain(const mixxx::ReplayGain& replayGain) {
}
void Track::adjustReplayGainFromPregain(double gain) {
- QMutexLocker lock(&m_qMutex);
+ auto locked = lockMutex(&m_qMutex);
mixxx::ReplayGain replayGain = m_record.getMetadata().getTrackInfo().getReplayGain();
replayGain.setRatio(gain * replayGain.getRatio());
if (compareAndSet(m_record.refMetadata().refTrackInfo().ptrReplayGain(), replayGain)) {
- markDirtyAndUnlock(&lock);
+ markDirtyAndUnlock(&locked);
emit replayGainAdjusted(replayGain);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 22:20:39 +0000