summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/library/banshee/bansheeplaylistmodel.cpp2
-rw-r--r--src/library/baseexternalplaylistmodel.cpp2
-rw-r--r--src/library/baseexternaltrackmodel.cpp2
-rw-r--r--src/library/basesqltablemodel.cpp2
-rw-r--r--src/library/browse/browsetablemodel.cpp2
-rw-r--r--src/library/dao/trackdao.cpp4
-rw-r--r--src/mixer/basetrackplayer.cpp2
-rw-r--r--src/test/beatgridtest.cpp14
-rw-r--r--src/test/beatmaptest.cpp14
-rw-r--r--src/test/cuecontrol_test.cpp8
-rw-r--r--src/test/looping_control_test.cpp48
-rw-r--r--src/test/searchqueryparsertest.cpp38
-rw-r--r--src/track/track.cpp10
-rw-r--r--src/track/track.h2
14 files changed, 76 insertions, 74 deletions
diff --git a/src/library/banshee/bansheeplaylistmodel.cpp b/src/library/banshee/bansheeplaylistmodel.cpp
index a7f59eeeb9..a934774478 100644
--- a/src/library/banshee/bansheeplaylistmodel.cpp
+++ b/src/library/banshee/bansheeplaylistmodel.cpp
@@ -287,7 +287,7 @@ TrackPointer BansheePlaylistModel::getTrack(const QModelIndex& index) const {
pTrack->setRating(getFieldString(index, CLM_RATING).toInt());
pTrack->setTrackNumber(getFieldString(index, CLM_TRACKNUMBER));
double bpm = getFieldString(index, CLM_BPM).toDouble();
- pTrack->trySetBpm(bpm, false);
+ pTrack->trySetBpm(bpm);
pTrack->setBitrate(getFieldString(index, CLM_BITRATE).toInt());
pTrack->setComment(getFieldString(index, CLM_COMMENT));
pTrack->setComposer(getFieldString(index, CLM_COMPOSER));
diff --git a/src/library/baseexternalplaylistmodel.cpp b/src/library/baseexternalplaylistmodel.cpp
index 366339f75a..5a5ddf27f8 100644
--- a/src/library/baseexternalplaylistmodel.cpp
+++ b/src/library/baseexternalplaylistmodel.cpp
@@ -65,7 +65,7 @@ TrackPointer BaseExternalPlaylistModel::getTrack(const QModelIndex& index) const
float bpm = index.sibling(
index.row(), fieldIndex("bpm")).data().toString().toFloat();
- pTrack->trySetBpm(bpm, false);
+ pTrack->trySetBpm(bpm);
}
return pTrack;
}
diff --git a/src/library/baseexternaltrackmodel.cpp b/src/library/baseexternaltrackmodel.cpp
index 6cdcd15aeb..50bfda9d38 100644
--- a/src/library/baseexternaltrackmodel.cpp
+++ b/src/library/baseexternaltrackmodel.cpp
@@ -74,7 +74,7 @@ TrackPointer BaseExternalTrackModel::getTrack(const QModelIndex& index) const {
pTrack->setAlbum(album);
pTrack->setYear(year);
pTrack->setGenre(genre);
- pTrack->trySetBpm(bpm, false);
+ pTrack->trySetBpm(bpm);
}
} else {
qWarning() << "Failed to load external track" << location;
diff --git a/src/library/basesqltablemodel.cpp b/src/library/basesqltablemodel.cpp
index 2648bbf367..8a72b702d9 100644
--- a/src/library/basesqltablemodel.cpp
+++ b/src/library/basesqltablemodel.cpp
@@ -702,7 +702,7 @@ bool BaseSqlTableModel::setTrackValueForColumn(
} else if (fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_COMMENT) == column) {
pTrack->setComment(value.toString());
} else if (fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_BPM) == column) {
- pTrack->trySetBpm(static_cast<double>(value.toDouble()), false);
+ pTrack->trySetBpm(static_cast<double>(value.toDouble()));
} else if (fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_PLAYED) == column) {
// Update both the played flag and the number of times played
pTrack->updatePlayCounter(value.toBool());
diff --git a/src/library/browse/browsetablemodel.cpp b/src/library/browse/browsetablemodel.cpp
index 216550b6f7..1fa21fc59f 100644
--- a/src/library/browse/browsetablemodel.cpp
+++ b/src/library/browse/browsetablemodel.cpp
@@ -397,7 +397,7 @@ bool BrowseTableModel::setData(
pTrack->setAlbum(value.toString());
break;
case COLUMN_BPM:
- pTrack->trySetBpm(value.toDouble(), false);
+ pTrack->trySetBpm(value.toDouble());
break;
case COLUMN_KEY:
pTrack->setKeyText(value.toString());
diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
index 46b89082e2..681e1a4a03 100644
--- a/src/library/dao/trackdao.cpp
+++ b/src/library/dao/trackdao.cpp
@@ -1092,7 +1092,9 @@ bool setTrackBeats(const QSqlRecord& record, const int column,
if (pBeats) {
pTrack->trySetBeats(pBeats, bpmLocked);
} else {
- pTrack->trySetBpm(bpm, bpmLocked);
+ // Load a temorary beat grid without offset that will be replaced by the analyzer.
+ const auto pBeats = BeatFactory::makeBeatGrid(pTrack->getSampleRate(), bpm, 0.0);
+ pTrack->trySetBeats(pBeats, false);
}
return false;
}
diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp
index d6ad555479..86055faaf8 100644
--- a/src/mixer/basetrackplayer.cpp
+++ b/src/mixer/basetrackplayer.cpp
@@ -209,7 +209,7 @@ TrackPointer BaseTrackPlayerImpl::loadFakeTrack(bool bPlay, double filebpm) {
mixxx::audio::Bitrate(),
mixxx::Duration::fromSeconds(10));
if (filebpm > 0) {
- pTrack->trySetBpm(filebpm, false);
+ pTrack->trySetBpm(filebpm);
}
TrackPointer pOldTrack = m_pLoadedTrack;
diff --git a/src/test/beatgridtest.cpp b/src/test/beatgridtest.cpp
index 4f63317191..4538a934d1 100644
--- a/src/test/beatgridtest.cpp
+++ b/src/test/beatgridtest.cpp
@@ -27,7 +27,7 @@ TEST(BeatGridTest, Scale) {
TrackPointer pTrack = newTrack(sampleRate);
double bpm = 60.0;
- pTrack->trySetBpm(bpm, false);
+ pTrack->trySetBpm(bpm);
auto pGrid = BeatGrid::makeBeatGrid(pTrack->getSampleRate(), QString(), bpm, 0);
@@ -57,7 +57,7 @@ TEST(BeatGridTest, TestNthBeatWhenOnBeat) {
double bpm = 60.1;
const int kFrameSize = 2;
- pTrack->trySetBpm(bpm, false);
+ pTrack->trySetBpm(bpm);
double beatLength = (60.0 * sampleRate / bpm) * kFrameSize;
auto pGrid = BeatGrid::makeBeatGrid(pTrack->getSampleRate(), QString(), bpm, 0);
@@ -91,7 +91,7 @@ TEST(BeatGridTest, TestNthBeatWhenOnBeat_BeforeEpsilon) {
double bpm = 60.1;
const int kFrameSize = 2;
- pTrack->trySetBpm(bpm, false);
+ pTrack->trySetBpm(bpm);
double beatLength = (60.0 * sampleRate / bpm) * kFrameSize;
auto pGrid = BeatGrid::makeBeatGrid(pTrack->getSampleRate(), QString(), bpm, 0);
@@ -127,7 +127,7 @@ TEST(BeatGridTest, TestNthBeatWhenOnBeat_AfterEpsilon) {
double bpm = 60.1;
const int kFrameSize = 2;
- pTrack->trySetBpm(bpm, false);
+ pTrack->trySetBpm(bpm);
double beatLength = (60.0 * sampleRate / bpm) * kFrameSize;
auto pGrid = BeatGrid::makeBeatGrid(pTrack->getSampleRate(), QString(), bpm, 0);
@@ -163,7 +163,7 @@ TEST(BeatGridTest, TestNthBeatWhenNotOnBeat) {
double bpm = 60.1;
const int kFrameSize = 2;
- pTrack->trySetBpm(bpm, false);
+ pTrack->trySetBpm(bpm);
double beatLength = (60.0 * sampleRate / bpm) * kFrameSize;
auto pGrid = BeatGrid::makeBeatGrid(pTrack->getSampleRate(), QString(), bpm, 0);
@@ -195,13 +195,13 @@ TEST(BeatGridTest, FromMetadata) {
TrackPointer pTrack = newTrack(sampleRate);
double bpm = 60.1;
- double echoBpm = pTrack->trySetBpm(bpm, false);
+ double echoBpm = pTrack->trySetBpm(bpm);
EXPECT_DOUBLE_EQ(echoBpm, bpm);
auto pBeats = pTrack->getBeats();
EXPECT_DOUBLE_EQ(pBeats->getBpm(), bpm);
- echoBpm = pTrack->trySetBpm(-60.1, false);
+ echoBpm = pTrack->trySetBpm(-60.1);
EXPECT_DOUBLE_EQ(echoBpm, mixxx::Bpm::kValueUndefined);
pBeats = pTrack->getBeats();
diff --git a/src/test/beatmaptest.cpp b/src/test/beatmaptest.cpp
index 880b994714..bf246f9518 100644
--- a/src/test/beatmaptest.cpp
+++ b/src/test/beatmaptest.cpp
@@ -49,7 +49,7 @@ class BeatMapTest : public testing::Test {
TEST_F(BeatMapTest, Scale) {
const double bpm = 60.0;
- m_pTrack->trySetBpm(bpm, false);
+ m_pTrack->trySetBpm(bpm);
double beatLengthFrames = getBeatLengthFrames(bpm);
double startOffsetFrames = 7;
const int numBeats = 100;
@@ -79,7 +79,7 @@ TEST_F(BeatMapTest, Scale) {
TEST_F(BeatMapTest, TestNthBeat) {
const double bpm = 60.0;
- m_pTrack->trySetBpm(bpm, false);
+ m_pTrack->trySetBpm(bpm);
double beatLengthFrames = getBeatLengthFrames(bpm);
double startOffsetFrames = 7;
double beatLengthSamples = getBeatLengthSamples(bpm);
@@ -111,7 +111,7 @@ TEST_F(BeatMapTest, TestNthBeat) {
TEST_F(BeatMapTest, TestNthBeatWhenOnBeat) {
const double bpm = 60.0;
- m_pTrack->trySetBpm(bpm, false);
+ m_pTrack->trySetBpm(bpm);
double beatLengthFrames = getBeatLengthFrames(bpm);
double startOffsetFrames = 7;
double beatLengthSamples = getBeatLengthSamples(bpm);
@@ -148,7 +148,7 @@ TEST_F(BeatMapTest, TestNthBeatWhenOnBeat) {
TEST_F(BeatMapTest, TestNthBeatWhenOnBeat_BeforeEpsilon) {
const double bpm = 60.0;
- m_pTrack->trySetBpm(bpm, false);
+ m_pTrack->trySetBpm(bpm);
double beatLengthFrames = getBeatLengthFrames(bpm);
double startOffsetFrames = 7;
double beatLengthSamples = getBeatLengthSamples(bpm);
@@ -187,7 +187,7 @@ TEST_F(BeatMapTest, TestNthBeatWhenOnBeat_BeforeEpsilon) {
TEST_F(BeatMapTest, TestNthBeatWhenOnBeat_AfterEpsilon) {
const double bpm = 60.0;
- m_pTrack->trySetBpm(bpm, false);
+ m_pTrack->trySetBpm(bpm);
double beatLengthFrames = getBeatLengthFrames(bpm);
double startOffsetFrames = 7;
double beatLengthSamples = getBeatLengthSamples(bpm);
@@ -227,7 +227,7 @@ TEST_F(BeatMapTest, TestNthBeatWhenOnBeat_AfterEpsilon) {
TEST_F(BeatMapTest, TestNthBeatWhenNotOnBeat) {
const double bpm = 60.0;
- m_pTrack->trySetBpm(bpm, false);
+ m_pTrack->trySetBpm(bpm);
double beatLengthFrames = getBeatLengthFrames(bpm);
double startOffsetFrames = 7;
double beatLengthSamples = getBeatLengthSamples(bpm);
@@ -264,7 +264,7 @@ TEST_F(BeatMapTest, TestNthBeatWhenNotOnBeat) {
TEST_F(BeatMapTest, TestBpmAround) {
const double filebpm = 60.0;
double approx_beat_length = getBeatLengthSamples(filebpm);
- m_pTrack->trySetBpm(filebpm, false);
+ m_pTrack->trySetBpm(filebpm);
const int numBeats = 64;
QVector<double> beats;
diff --git a/src/test/cuecontrol_test.cpp b/src/test/cuecontrol_test.cpp
index 336742d42b..3be06ffea0 100644
--- a/src/test/cuecontrol_test.cpp
+++ b/src/test/cuecontrol_test.cpp
@@ -169,7 +169,7 @@ TEST_F(CueControlTest, LoadAutodetectedCues_QuantizeEnabled) {
m_pQuantizeEnabled->set(1);
TrackPointer pTrack = createTestTrack();
- pTrack->trySetBpm(120.0, false);
+ pTrack->trySetBpm(120.0);
const int frameSize = 2;
const int sampleRate = pTrack->getSampleRate();
@@ -201,7 +201,7 @@ TEST_F(CueControlTest, LoadAutodetectedCues_QuantizeEnabledNoBeats) {
m_pQuantizeEnabled->set(1);
TrackPointer pTrack = createTestTrack();
- pTrack->trySetBpm(0.0, false);
+ pTrack->trySetBpm(0.0);
pTrack->setCuePoint(CuePosition(100.0));
@@ -228,7 +228,7 @@ TEST_F(CueControlTest, LoadAutodetectedCues_QuantizeDisabled) {
m_pQuantizeEnabled->set(0);
TrackPointer pTrack = createTestTrack();
- pTrack->trySetBpm(120.0, false);
+ pTrack->trySetBpm(120.0);
pTrack->setCuePoint(CuePosition(240.0));
@@ -333,7 +333,7 @@ TEST_F(CueControlTest, FollowCueOnQuantize) {
config()->set(ConfigKey("[Controls]", "CueRecall"),
ConfigValue(static_cast<int>(SeekOnLoadMode::MainCue)));
TrackPointer pTrack = createTestTrack();
- pTrack->trySetBpm(120.0, false);
+ pTrack->trySetBpm(120.0);
const int frameSize = 2;
const int sampleRate = pTrack->getSampleRate();
diff --git a/src/test/looping_control_test.cpp b/src/test/looping_control_test.cpp
index 0c2f136b00..7f0dcb1fde 100644
--- a/src/test/looping_control_test.cpp
+++ b/src/test/looping_control_test.cpp
@@ -276,7 +276,7 @@ TEST_F(LoopingControlTest, LoopOutButton_AdjustLoopOutPointInsideLoop) {
}
TEST_F(LoopingControlTest, LoopInOutButtons_QuantizeEnabled) {
- m_pTrack1->trySetBpm(60.0, false);
+ m_pTrack1->trySetBpm(60.0);
m_pQuantizeEnabled->set(1);
seekToSampleAndProcess(500);
m_pButtonLoopIn->set(1);
@@ -425,7 +425,7 @@ TEST_F(LoopingControlTest, LoopDoubleButton_IgnoresPastTrackEnd) {
}
TEST_F(LoopingControlTest, LoopDoubleButton_DoublesBeatloopSize) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
m_pBeatLoopSize->set(16.0);
m_pButtonBeatLoopActivate->set(1.0);
m_pButtonBeatLoopActivate->set(0.0);
@@ -450,7 +450,7 @@ TEST_F(LoopingControlTest, LoopDoubleButton_DoesNotResizeManualLoop) {
}
TEST_F(LoopingControlTest, LoopDoubleButton_UpdatesNumberedBeatloopActivationControls) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
m_pBeatLoopSize->set(2.0);
m_pButtonBeatLoopActivate->set(1.0);
m_pButtonBeatLoopActivate->set(0.0);
@@ -476,7 +476,7 @@ TEST_F(LoopingControlTest, LoopHalveButton_IgnoresTooSmall) {
}
TEST_F(LoopingControlTest, LoopHalveButton_HalvesBeatloopSize) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
m_pBeatLoopSize->set(64.0);
m_pButtonBeatLoopActivate->set(1.0);
m_pButtonBeatLoopActivate->set(0.0);
@@ -501,7 +501,7 @@ TEST_F(LoopingControlTest, LoopHalveButton_DoesNotResizeManualLoop) {
}
TEST_F(LoopingControlTest, LoopHalveButton_UpdatesNumberedBeatloopActivationControls) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
m_pBeatLoopSize->set(4.0);
m_pButtonBeatLoopActivate->set(1.0);
m_pButtonBeatLoopActivate->set(0.0);
@@ -515,7 +515,7 @@ TEST_F(LoopingControlTest, LoopHalveButton_UpdatesNumberedBeatloopActivationCont
}
TEST_F(LoopingControlTest, LoopMoveTest) {
- m_pTrack1->trySetBpm(120, false);
+ m_pTrack1->trySetBpm(120);
m_pLoopStartPoint->slotSet(0);
m_pLoopEndPoint->slotSet(300);
seekToSampleAndProcess(10);
@@ -585,7 +585,7 @@ TEST_F(LoopingControlTest, LoopResizeSeek) {
// Disable quantize for this test
m_pQuantizeEnabled->set(0.0);
- m_pTrack1->trySetBpm(23520, false);
+ m_pTrack1->trySetBpm(23520);
m_pLoopStartPoint->slotSet(0);
m_pLoopEndPoint->slotSet(600);
seekToSampleAndProcess(500);
@@ -626,7 +626,7 @@ TEST_F(LoopingControlTest, LoopResizeSeek) {
}
TEST_F(LoopingControlTest, BeatLoopSize_SetAndToggle) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
// Setting beatloop_size should not activate a loop
m_pBeatLoopSize->set(2.0);
EXPECT_FALSE(m_pLoopEnabled->toBool());
@@ -652,7 +652,7 @@ TEST_F(LoopingControlTest, BeatLoopSize_SetWithoutTrackLoaded) {
TEST_F(LoopingControlTest, BeatLoopSize_IgnoresPastTrackEnd) {
// TODO: actually calculate that the beatloop would go beyond
// the end of the track
- m_pTrack1->trySetBpm(60.0, false);
+ m_pTrack1->trySetBpm(60.0);
seekToSampleAndProcess(m_pTrackSamples->get() - 400);
m_pBeatLoopSize->set(64.0);
EXPECT_NE(64.0, m_pBeatLoopSize->get());
@@ -660,7 +660,7 @@ TEST_F(LoopingControlTest, BeatLoopSize_IgnoresPastTrackEnd) {
}
TEST_F(LoopingControlTest, BeatLoopSize_SetsNumberedControls) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
m_pBeatLoopSize->set(2.0);
m_pButtonBeatLoopActivate->set(1.0);
m_pButtonBeatLoopActivate->set(0.0);
@@ -674,7 +674,7 @@ TEST_F(LoopingControlTest, BeatLoopSize_SetsNumberedControls) {
}
TEST_F(LoopingControlTest, BeatLoopSize_IsSetByNumberedControl) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
m_pBeatLoopSize->set(4.0);
m_pButtonBeatLoop2Activate->set(1.0);
m_pButtonBeatLoop2Activate->set(0.0);
@@ -690,14 +690,14 @@ TEST_F(LoopingControlTest, BeatLoopSize_IsSetByNumberedControl) {
}
TEST_F(LoopingControlTest, BeatLoopSize_SetDoesNotStartLoop) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
m_pBeatLoopSize->set(16.0);
EXPECT_FALSE(m_pLoopEnabled->toBool());
}
TEST_F(LoopingControlTest, BeatLoopSize_ResizeKeepsStartPosition) {
seekToSampleAndProcess(50);
- m_pTrack1->trySetBpm(160.0, false);
+ m_pTrack1->trySetBpm(160.0);
m_pBeatLoopSize->set(2.0);
m_pButtonBeatLoopActivate->set(1.0);
m_pButtonBeatLoopActivate->set(0.0);
@@ -713,7 +713,7 @@ TEST_F(LoopingControlTest, BeatLoopSize_ResizeKeepsStartPosition) {
TEST_F(LoopingControlTest, BeatLoopSize_ValueChangeDoesNotActivateLoop) {
seekToSampleAndProcess(50);
- m_pTrack1->trySetBpm(160.0, false);
+ m_pTrack1->trySetBpm(160.0);
m_pBeatLoopSize->set(2.0);
m_pButtonBeatLoopActivate->set(1.0);
m_pButtonBeatLoopActivate->set(0.0);
@@ -729,7 +729,7 @@ TEST_F(LoopingControlTest, BeatLoopSize_ValueChangeDoesNotActivateLoop) {
TEST_F(LoopingControlTest, BeatLoopSize_ValueChangeResizesBeatLoop) {
seekToSampleAndProcess(50);
- m_pTrack1->trySetBpm(160.0, false);
+ m_pTrack1->trySetBpm(160.0);
m_pBeatLoopSize->set(2.0);
m_pButtonBeatLoopActivate->set(1.0);
m_pButtonBeatLoopActivate->set(0.0);
@@ -753,7 +753,7 @@ TEST_F(LoopingControlTest, BeatLoopSize_ValueChangeResizesBeatLoop) {
TEST_F(LoopingControlTest, BeatLoopSize_ValueChangeDoesNotResizeManualLoop) {
seekToSampleAndProcess(50);
- m_pTrack1->trySetBpm(160.0, false);
+ m_pTrack1->trySetBpm(160.0);
m_pQuantizeEnabled->set(0);
m_pBeatLoopSize->set(4.0);
m_pButtonLoopIn->slotSet(1);
@@ -772,7 +772,7 @@ TEST_F(LoopingControlTest, BeatLoopSize_ValueChangeDoesNotResizeManualLoop) {
}
TEST_F(LoopingControlTest, LegacyBeatLoopControl) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
m_pBeatLoop->set(2.0);
EXPECT_TRUE(m_pBeatLoop2Enabled->toBool());
EXPECT_TRUE(m_pLoopEnabled->toBool());
@@ -792,7 +792,7 @@ TEST_F(LoopingControlTest, LegacyBeatLoopControl) {
}
TEST_F(LoopingControlTest, Beatjump_JumpsByBeats) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
ProcessBuffer();
double beatLength = m_pNextBeat->get();
@@ -810,7 +810,7 @@ TEST_F(LoopingControlTest, Beatjump_JumpsByBeats) {
}
TEST_F(LoopingControlTest, Beatjump_MovesActiveLoop) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
ProcessBuffer();
m_pBeatLoopSize->set(4.0);
@@ -842,7 +842,7 @@ TEST_F(LoopingControlTest, Beatjump_MovesActiveLoop) {
TEST_F(LoopingControlTest, Beatjump_MovesLoopBoundaries) {
// Holding down the loop in/out buttons and using beatjump should
// move only the loop in/out point, but not shift the entire loop forward/backward
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
ProcessBuffer();
m_pBeatLoopSize->set(4.0);
@@ -893,7 +893,7 @@ TEST_F(LoopingControlTest, LoopEscape) {
}
TEST_F(LoopingControlTest, BeatLoopRoll_Activation) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
m_pButtonBeatLoopRoll2Activate->set(1.0);
EXPECT_TRUE(m_pLoopEnabled->toBool());
@@ -905,7 +905,7 @@ TEST_F(LoopingControlTest, BeatLoopRoll_Activation) {
}
TEST_F(LoopingControlTest, BeatLoopRoll_Overlap) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
m_pButtonBeatLoopRoll2Activate->set(1.0);
EXPECT_TRUE(m_pLoopEnabled->toBool());
@@ -927,7 +927,7 @@ TEST_F(LoopingControlTest, BeatLoopRoll_Overlap) {
}
TEST_F(LoopingControlTest, BeatLoopRoll_OverlapStackUnwind) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
// start a 2 beat loop roll
m_pButtonBeatLoopRoll2Activate->set(1.0);
@@ -964,7 +964,7 @@ TEST_F(LoopingControlTest, BeatLoopRoll_OverlapStackUnwind) {
}
TEST_F(LoopingControlTest, BeatLoopRoll_StartPoint) {
- m_pTrack1->trySetBpm(120.0, false);
+ m_pTrack1->trySetBpm(120.0);
// start a 4 beat loop roll, start point should be overridden to play position
m_pLoopStartPoint->slotSet(8);
diff --git a/src/test/searchqueryparsertest.cpp b/src/test/searchqueryparsertest.cpp
index 7f56fea111..ae333c6a67 100644
--- a/src/test/searchqueryparsertest.cpp
+++ b/src/test/searchqueryparsertest.cpp
@@ -372,9 +372,9 @@ TEST_F(SearchQueryParserTest, NumericFilter) {
m_parser.parseQuery("bpm:127.12", searchColumns, ""));
TrackPointer pTrack = newTestTrack(44100);
- pTrack->trySetBpm(127, false);
+ pTrack->trySetBpm(127);
EXPECT_FALSE(pQuery->match(pTrack));
- pTrack->trySetBpm(127.12, false);
+ pTrack->trySetBpm(127.12);
EXPECT_TRUE(pQuery->match(pTrack));
EXPECT_STREQ(
@@ -391,7 +391,7 @@ TEST_F(SearchQueryParserTest, NumericFilterEmpty) {
m_parser.parseQuery("bpm:", searchColumns, ""));
TrackPointer pTrack = newTestTrack(44100);
- pTrack->trySetBpm(127, false);
+ pTrack->trySetBpm(127);
EXPECT_TRUE(pQuery->match(pTrack));
EXPECT_STREQ(
@@ -408,9 +408,9 @@ TEST_F(SearchQueryParserTest, NumericFilterNegation) {
m_parser.parseQuery("-bpm:127.12", searchColumns, ""));
TrackPointer pTrack = newTestTrack(44100);
- pTrack->trySetBpm(127, false);
+ pTrack->trySetBpm(127);
EXPECT_TRUE(pQuery->match(pTrack));
- pTrack->trySetBpm(127.12, false);
+ pTrack->trySetBpm(127.12);
EXPECT_FALSE(pQuery->match(pTrack));
EXPECT_STREQ(
@@ -427,9 +427,9 @@ TEST_F(SearchQueryParserTest, NumericFilterAllowsSpace) {
m_parser.parseQuery("bpm: 127.12", searchColumns, ""));
TrackPointer pTrack = newTestTrack(44100);
- pTrack->trySetBpm(127, false);
+ pTrack->trySetBpm(127);
EXPECT_FALSE(pQuery->match(pTrack));
- pTrack->trySetBpm(127.12, false);
+ pTrack->trySetBpm(127.12);
EXPECT_TRUE(pQuery->match(pTrack));
EXPECT_STREQ(
@@ -446,9 +446,9 @@ TEST_F(SearchQueryParserTest, NumericFilterOperators) {
m_parser.parseQuery("bpm:>127.12", searchColumns, ""));
TrackPointer pTrack = newTestTrack(44100);
- pTrack->trySetBpm(127.12, false);
+ pTrack->trySetBpm(127.12);
EXPECT_FALSE(pQuery->match(pTrack));
- pTrack->trySetBpm(127.13, false);
+ pTrack->trySetBpm(127.13);
EXPECT_TRUE(pQuery->match(pTrack));
EXPECT_STREQ(
qPrintable(QString("bpm > 127.12")),
@@ -456,27 +456,27 @@ TEST_F(SearchQueryParserTest, NumericFilterOperators) {
pQuery = m_parser.parseQuery("bpm:>=127.12", searchColumns, "");
- pTrack->trySetBpm(127.11, false);
+ pTrack->trySetBpm(127.11);
EXPECT_FALSE(pQuery->match(pTrack));
- pTrack->trySetBpm(127.12, false);
+ pTrack->trySetBpm(127.12);
EXPECT_TRUE(pQuery->match(pTrack));
EXPECT_STREQ(
qPrintable(QString("bpm >= 127.12")),
qPrintable(pQuery->toSql()));
pQuery = m_parser.parseQuery("bpm:<127.12", searchColumns, "");
- pTrack->trySetBpm(127.12, false);
+ pTrack->trySetBpm(127.12);
EXPECT_FALSE(pQuery->match(pTrack));
- pTrack->trySetBpm(127.11, false);
+ pTrack->trySetBpm(127.11);
EXPECT_TRUE(pQuery->match(pTrack));
EXPECT_STREQ(
qPrintable(QString("bpm < 127.12")),
qPrintable(pQuery->toSql()));
pQuery = m_parser.parseQuery("bpm:<=127.12", searchColumns, "");
- pTrack->trySetBpm(127.13, false);
+ pTrack->trySetBpm(127.13);
EXPECT_FALSE(pQuery->match(pTrack));
- pTrack->trySetBpm(127.12, false);
+ pTrack->trySetBpm(127.12);
EXPECT_TRUE(pQuery->match(pTrack));
EXPECT_STREQ(
qPrintable(QString("bpm <= 127.12")),
@@ -492,11 +492,11 @@ TEST_F(SearchQueryParserTest, NumericRangeFilter) {
m_parser.parseQuery("bpm:127.12-129", searchColumns, ""));
TrackPointer pTrack = newTestTrack(44100);
- pTrack->trySetBpm(125, false);
+ pTrack->trySetBpm(125);
EXPECT_FALSE(pQuery->match(pTrack));
- pTrack->trySetBpm(127.12, false);
+ pTrack->trySetBpm(127.12);
EXPECT_TRUE(pQuery->match(pTrack));
- pTrack->trySetBpm(129, false);
+ pTrack->trySetBpm(129);
EXPECT_TRUE(pQuery->match(pTrack));
EXPECT_STREQ(
@@ -514,7 +514,7 @@ TEST_F(SearchQueryParserTest, MultipleFilters) {
searchColumns, ""));
TrackPointer pTrack = newTestTrack(44100);
- pTrack->trySetBpm(128, false);
+ pTrack->trySetBpm(128);
EXPECT_FALSE(pQuery->match(pTrack));
pTrack->setArtist("Com Truise");
EXPECT_FALSE(pQuery->match(pTrack));
diff --git a/src/track/track.cpp b/src/track/track.cpp
index b7689adb32..c76f8edfe5 100644
--- a/src/track/track.cpp
+++ b/src/track/track.cpp
@@ -199,7 +199,7 @@ void Track::importMetadata(
// knowing the sample rate. Bug #1020438.
const auto actualBpm = getActualBpm(newBpm, m_pBeats);
if (actualBpm.hasValue()) {
- trySetBpm(actualBpm.getValue(), false);
+ trySetBpm(actualBpm.getValue());
}
if (!newKey.isEmpty()
@@ -271,25 +271,25 @@ double Track::getBpm() const {
return bpm;
}
-double Track::trySetBpm(double bpmValue, bool lockBpmAfterSet) {
+double Track::trySetBpm(double bpmValue) {
QMutexLocker lock(&m_qMutex);
if (!mixxx::Bpm::isValidValue(bpmValue)) {
// If the user sets the BPM to an invalid value, we assume
// they want to clear the beatgrid.
- trySetBeatsMarkDirtyAndUnlock(&lock, nullptr, lockBpmAfterSet);
+ trySetBeatsMarkDirtyAndUnlock(&lock, nullptr, false);
} else if (!m_pBeats) {
// No beat grid available -> create and initialize
double cue = getCuePoint().getPosition();
const auto pBeats = BeatFactory::makeBeatGrid(getSampleRate(), bpmValue, cue);
- trySetBeatsMarkDirtyAndUnlock(&lock, pBeats, lockBpmAfterSet);
+ trySetBeatsMarkDirtyAndUnlock(&lock, pBeats, false);
} else if ((m_pBeats->getCapabilities() & mixxx::Beats::BEATSCAP_SETBPM) &&
m_pBeats->getBpm() != bpmValue) {
// Continue with the regular cases
if (kLogger.debugEnabled()) {
kLogger.debug() << "Updating BPM:" << getLocation();
}
- trySetBeatsMarkDirtyAndUnlock(&lock, m_pBeats->setBpm(bpmValue), lockBpmAfterSet);
+ trySetBeatsMarkDirtyAndUnlock(&lock, m_pBeats->setBpm(bpmValue), false);
}
if (m_pBeats) {
diff --git a/src/track/track.h b/src/track/track.h
index bac2f8d037..7395adbe35 100644
--- a/src/track/track.h
+++ b/src/track/track.h
@@ -126,7 +126,7 @@ class Track : public QObject {
}
// Sets the BPM if not locked.
- double trySetBpm(double bpm, bool lockBpmAfterSet);
+ double trySetBpm(double bpm);
// Returns BPM
double getBpm() const;
// Returns BPM as a string
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 21:01:44 +0000