Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not create a new loop if it's the same as an existing loop #11006

Merged
merged 5 commits into from
Nov 3, 2022
Merged

Do not create a new loop if it's the same as an existing loop #11006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dcf034d
Do not create a new loop if it's the same as an existing loop
ywwg Oct 25, 2022
4073e01
Slightly more precise fix for loop creation seek bug
ywwg Oct 25, 2022
505c3ba
Hotcue loops: make sure to test both bounds
ywwg Oct 26, 2022
8eb7647
Hot Cue Loops:
ywwg Nov 1, 2022
28b28ab
Hotcue Loops: Do set the MovedOut seek mode in case the playhead ends…
ywwg Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions src/engine/controls/loopingcontrol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@

namespace {
constexpr mixxx::audio::FrameDiff_t kMinimumAudibleLoopSizeFrames = 150;

// returns true if a is valid and is fairly close to target (within +/- 1 frame).
bool positionNear(mixxx::audio::FramePos a, mixxx::audio::FramePos target) {
return a.isValid() && a > target - 1 && a < target + 1;
}
}

double LoopingControl::s_dBeatSizes[] = { 0.03125, 0.0625, 0.125, 0.25, 0.5,
Expand Down Expand Up @@ -626,7 +631,10 @@ void LoopingControl::setLoop(mixxx::audio::FramePos startPosition,
slotLoopInGoto(1);
}

// Don't allow loop size widget setting to trigger creation of another loop.
m_pCOBeatLoopSize->blockSignals(true);
m_pCOBeatLoopSize->setAndConfirm(findBeatloopSizeForLoop(startPosition, endPosition));
m_pCOBeatLoopSize->blockSignals(false);
}

void LoopingControl::setLoopInToCurrentPosition() {
Expand Down Expand Up @@ -1182,13 +1190,12 @@ void LoopingControl::clearActiveBeatLoop() {
}
}

bool LoopingControl::currentLoopMatchesBeatloopSize() {
bool LoopingControl::currentLoopMatchesBeatloopSize(const LoopInfo& loopInfo) const {
const mixxx::BeatsPointer pBeats = m_pBeats;
if (!pBeats) {
return false;
}

LoopInfo loopInfo = m_loopInfo.getValue();
if (!loopInfo.startPosition.isValid()) {
return false;
}
Expand All @@ -1197,9 +1204,7 @@ bool LoopingControl::currentLoopMatchesBeatloopSize() {
const auto loopEndPosition = pBeats->findNBeatsFromPosition(
loopInfo.startPosition, m_pCOBeatLoopSize->get());

return loopInfo.endPosition.isValid() &&
loopInfo.endPosition > loopEndPosition - 1 &&
loopInfo.endPosition < loopEndPosition + 1;
return positionNear(loopInfo.endPosition, loopEndPosition);
}

double LoopingControl::findBeatloopSizeForLoop(
Expand Down Expand Up @@ -1382,7 +1387,7 @@ void LoopingControl::slotBeatLoop(double beats, bool keepStartPoint, bool enable
// the size of the existing loop.
// Do not return immediately so beatloop_size can be updated.
bool omitResize = false;
if (!currentLoopMatchesBeatloopSize() && !enable) {
if (!currentLoopMatchesBeatloopSize(loopInfo) && !enable) {
omitResize = true;
}

Expand All @@ -1400,12 +1405,16 @@ void LoopingControl::slotBeatLoop(double beats, bool keepStartPoint, bool enable
return;
}

// If resizing an inactive loop by changing beatloop_size,
// do not seek to the adjusted loop.
newloopInfo.seekMode = (keepStartPoint && (enable || m_bLoopingEnabled))
? LoopSeekMode::Changed
: LoopSeekMode::MovedOut;

// If the start point has changed, or the loop is not enabled,
// or if the endpoints are nearly the same, do not seek forward into the adjusted loop.
if (!keepStartPoint ||
!(enable || m_bLoopingEnabled) ||
(positionNear(newloopInfo.startPosition, loopInfo.startPosition) &&
positionNear(newloopInfo.endPosition, loopInfo.endPosition))) {
newloopInfo.seekMode = LoopSeekMode::MovedOut;
} else {
newloopInfo.seekMode = LoopSeekMode::Changed;
}
m_loopInfo.setValue(newloopInfo);
emit loopUpdated(newloopInfo.startPosition, newloopInfo.endPosition);
m_pCOLoopStartPosition->set(newloopInfo.startPosition.toEngineSamplePos());
Expand Down Expand Up @@ -1528,7 +1537,7 @@ void LoopingControl::slotLoopMove(double beats) {
nullptr)) {
const auto newLoopStartPosition =
pBeats->findNBeatsFromPosition(loopInfo.startPosition, beats);
const auto newLoopEndPosition = currentLoopMatchesBeatloopSize()
const auto newLoopEndPosition = currentLoopMatchesBeatloopSize(loopInfo)
? pBeats->findNBeatsFromPosition(newLoopStartPosition, m_pCOBeatLoopSize->get())
: pBeats->findNBeatsFromPosition(loopInfo.endPosition, beats);

Expand Down
2 changes: 1 addition & 1 deletion src/engine/controls/loopingcontrol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class LoopingControl : public EngineControl {
void setLoopOutToCurrentPosition();
void clearActiveBeatLoop();
void updateBeatLoopingControls();
bool currentLoopMatchesBeatloopSize();
bool currentLoopMatchesBeatloopSize(const LoopInfo& loopInfo) const;

// Given loop in and out points, determine if this is a beatloop of a particular
// size.
Expand Down