summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2021-10-01 01:35:44 +0200
committerUwe Klotz <uklotz@mixxx.org>2021-10-01 01:55:45 +0200
commit90d362b0329234490beeee9d9ebb9eab2082a781 (patch)
tree43ec6803899436c6f918547179309224ecf7bb29
parent91b5d8c16d33fd5417c53001e36511f5764ad510 (diff)
Beats: Rename clone() function
-rw-r--r--src/track/beatgrid.cpp10
-rw-r--r--src/track/beatmap.cpp8
-rw-r--r--src/track/beats.h2
3 files changed, 10 insertions, 10 deletions
diff --git a/src/track/beatgrid.cpp b/src/track/beatgrid.cpp
index 2da516c643..c52f30b19e 100644
--- a/src/track/beatgrid.cpp
+++ b/src/track/beatgrid.cpp
@@ -263,7 +263,7 @@ mixxx::Bpm BeatGrid::getBpmAroundPosition(audio::FramePos position, int n) const
BeatsPointer BeatGrid::translate(audio::FrameDiff_t offset) const {
VERIFY_OR_DEBUG_ASSERT(isValid()) {
- return clone();
+ return clonePointer();
}
mixxx::track::io::BeatGrid grid = m_grid;
@@ -277,7 +277,7 @@ BeatsPointer BeatGrid::translate(audio::FrameDiff_t offset) const {
BeatsPointer BeatGrid::scale(BpmScale scale) const {
VERIFY_OR_DEBUG_ASSERT(isValid()) {
- return clone();
+ return clonePointer();
}
mixxx::track::io::BeatGrid grid = m_grid;
@@ -304,11 +304,11 @@ BeatsPointer BeatGrid::scale(BpmScale scale) const {
break;
default:
DEBUG_ASSERT(!"scale value invalid");
- return clone();
+ return clonePointer();
}
if (!bpm.isValid()) {
- return clone();
+ return clonePointer();
}
bpm = BeatUtils::roundBpmWithinRange(bpm - kBpmScaleRounding, bpm, bpm + kBpmScaleRounding);
@@ -319,7 +319,7 @@ BeatsPointer BeatGrid::scale(BpmScale scale) const {
BeatsPointer BeatGrid::setBpm(mixxx::Bpm bpm) const {
VERIFY_OR_DEBUG_ASSERT(bpm.isValid()) {
- return clone();
+ return clonePointer();
}
mixxx::track::io::BeatGrid grid = m_grid;
diff --git a/src/track/beatmap.cpp b/src/track/beatmap.cpp
index e32b057f04..3a51a9f040 100644
--- a/src/track/beatmap.cpp
+++ b/src/track/beatmap.cpp
@@ -534,7 +534,7 @@ mixxx::Bpm BeatMap::getBpmAroundPosition(audio::FramePos position, int n) const
BeatsPointer BeatMap::translate(audio::FrameDiff_t offset) const {
if (!isValid()) {
- return clone();
+ return clonePointer();
}
BeatList beats = m_beats;
@@ -557,7 +557,7 @@ BeatsPointer BeatMap::translate(audio::FrameDiff_t offset) const {
BeatsPointer BeatMap::scale(BpmScale scale) const {
VERIFY_OR_DEBUG_ASSERT(isValid()) {
- return clone();
+ return clonePointer();
}
BeatList beats = m_beats;
@@ -596,7 +596,7 @@ BeatsPointer BeatMap::scale(BpmScale scale) const {
break;
default:
DEBUG_ASSERT(!"scale value invalid");
- return clone();
+ return clonePointer();
}
mixxx::Bpm bpm = calculateNominalBpm(beats, m_sampleRate);
@@ -605,7 +605,7 @@ BeatsPointer BeatMap::scale(BpmScale scale) const {
BeatsPointer BeatMap::setBpm(mixxx::Bpm bpm) const {
VERIFY_OR_DEBUG_ASSERT(bpm.isValid()) {
- return clone();
+ return clonePointer();
}
const auto firstBeatPosition = mixxx::audio::FramePos(m_beats.first().frame_position());
diff --git a/src/track/beats.h b/src/track/beats.h
index 4add4a3578..085edcb52a 100644
--- a/src/track/beats.h
+++ b/src/track/beats.h
@@ -33,7 +33,7 @@ class Beats : private std::enable_shared_from_this<Beats> {
public:
virtual ~Beats() = default;
- BeatsPointer clone() const {
+ BeatsPointer clonePointer() const {
// All instances are immutable and can be shared safely
return shared_from_this();
}