diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2021-03-11 10:24:40 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2021-03-11 14:18:45 +0100 |
commit | 4f473a8c2a163d4e00b0bc9db5843fe468df6ded (patch) | |
tree | 3cb7f4d3941c606cfd30f49de510380e2b78cdb7 /src/engine | |
parent | 8869f2ae8379b8a08f79baed9550f1c32748519e (diff) |
Add wapper trySetAndLockBeats() to stream line the track API
Diffstat (limited to 'src/engine')
-rw-r--r-- | src/engine/controls/bpmcontrol.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp index 67612b5778..2bb58317d9 100644 --- a/src/engine/controls/bpmcontrol.cpp +++ b/src/engine/controls/bpmcontrol.cpp @@ -172,7 +172,7 @@ void BpmControl::slotAdjustBeatsFaster(double v) { if (pBeats && (pBeats->getCapabilities() & mixxx::Beats::BEATSCAP_SETBPM)) { double bpm = pBeats->getBpm(); double adjustedBpm = bpm + kBpmAdjustStep; - pTrack->trySetBeats(pBeats->setBpm(adjustedBpm), false); + pTrack->trySetBeats(pBeats->setBpm(adjustedBpm)); } } @@ -188,7 +188,7 @@ void BpmControl::slotAdjustBeatsSlower(double v) { if (pBeats && (pBeats->getCapabilities() & mixxx::Beats::BEATSCAP_SETBPM)) { double bpm = pBeats->getBpm(); double adjustedBpm = math_max(kBpmAdjustMin, bpm - kBpmAdjustStep); - pTrack->trySetBeats(pBeats->setBpm(adjustedBpm), false); + pTrack->trySetBeats(pBeats->setBpm(adjustedBpm)); } } @@ -204,7 +204,7 @@ void BpmControl::slotTranslateBeatsEarlier(double v) { if (pBeats && (pBeats->getCapabilities() & mixxx::Beats::BEATSCAP_TRANSLATE)) { const double translate_dist = getSampleOfTrack().rate * -.01; - pTrack->trySetBeats(pBeats->translate(translate_dist), false); + pTrack->trySetBeats(pBeats->translate(translate_dist)); } } @@ -221,7 +221,7 @@ void BpmControl::slotTranslateBeatsLater(double v) { (pBeats->getCapabilities() & mixxx::Beats::BEATSCAP_TRANSLATE)) { // TODO(rryan): Track::getSampleRate is possibly inaccurate! const double translate_dist = getSampleOfTrack().rate * .01; - pTrack->trySetBeats(pBeats->translate(translate_dist), false); + pTrack->trySetBeats(pBeats->translate(translate_dist)); } } @@ -255,7 +255,7 @@ void BpmControl::slotTapFilter(double averageLength, int numSamples) { // (60 seconds per minute) * (1000 milliseconds per second) / (X millis per // beat) = Y beats/minute double averageBpm = 60.0 * 1000.0 / averageLength / rateRatio; - pTrack->trySetBeats(pBeats->setBpm(averageBpm), false); + pTrack->trySetBeats(pBeats->setBpm(averageBpm)); } void BpmControl::slotControlBeatSyncPhase(double value) { @@ -1020,7 +1020,7 @@ void BpmControl::slotBeatsTranslate(double v) { if (delta % 2 != 0) { delta--; } - pTrack->trySetBeats(pBeats->translate(delta), false); + pTrack->trySetBeats(pBeats->translate(delta)); } } @@ -1039,7 +1039,7 @@ void BpmControl::slotBeatsTranslateMatchAlignment(double v) { m_dUserOffset.setValue(0.0); double offset = getPhaseOffset(getSampleOfTrack().current); - pTrack->trySetBeats(pBeats->translate(-offset), false); + pTrack->trySetBeats(pBeats->translate(-offset)); } } |