Looping: update loopsize when recalling loop with any size

ronso0 · Jan 4, 2024 · 9289597 · 9289597
1 parent ee1263b
commit 9289597
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 8 deletions.
diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp
@@ -1299,15 +1299,33 @@ double LoopingControl::findBeatloopSizeForLoop(
         return -1;
     }
 
-    for (unsigned int i = 0; i < (sizeof(s_dBeatSizes) / sizeof(s_dBeatSizes[0])); ++i) {
-        const auto loopEndPosition = pBeats->findNBeatsFromPosition(startPosition, s_dBeatSizes[i]);
+    // First we check if this is one of the preset sizes
+    const auto beatSizes = getBeatSizes();
+    for (const auto size : beatSizes) {
+        const auto loopEndPosition = pBeats->findNBeatsFromPosition(startPosition, size);
         if (loopEndPosition.isValid()) {
             if (endPosition > (loopEndPosition - 1) && endPosition < (loopEndPosition + 1)) {
-                return s_dBeatSizes[i];
+                return size;
             }
         }
     }
-    return -1;
+
+    // No hit. Let's check integer sizes 1 - [max. loop size]
+    for (unsigned int i = 1; i < beatSizes.last(); ++i) {
+        if (beatSizes.contains(i)) {
+            // skip sizes we already checked above
+            continue;
+        }
+        const auto loopEndPosition = pBeats->findNBeatsFromPosition(startPosition, i);
+        if (loopEndPosition.isValid()) {
+            if (endPosition > (loopEndPosition - 1) && endPosition < (loopEndPosition + 1)) {
+                return i;
+            }
+        }
+    }
+
+    // Still no hit. Calculate the fractional beat length
+    return pBeats->numFractionalBeatsInRange(startPosition, endPosition);
 }
 
 void LoopingControl::updateBeatLoopingControls() {
@@ -1449,10 +1467,10 @@ void LoopingControl::slotBeatLoop(double beats, bool keepStartPoint, bool enable
 
     if (!newloopInfo.startPosition.isValid() ||
             !newloopInfo.endPosition.isValid() ||
-            newloopInfo.startPosition >=
-                    newloopInfo.endPosition // happens when the call above fails
-            || newloopInfo.endPosition >
-                    trackEndPosition) { // Do not allow beat loops to go beyond the end of the track
+            // happens when the call above fails
+            newloopInfo.startPosition >= newloopInfo.endPosition ||
+            // Do not allow beat loops to go beyond the end of the track
+            newloopInfo.endPosition > trackEndPosition) {
         // If a track is loaded with beatloop_size larger than
         // the distance between the loop in point and
         // the end of the track, let beatloop_size be set to

diff --git a/src/track/beats.cpp b/src/track/beats.cpp
@@ -734,6 +734,27 @@ int Beats::numBeatsInRange(audio::FramePos startPosition, audio::FramePos endPos
     return i - 2;
 };
 
+double Beats::numFractionalBeatsInRange(audio::FramePos startPosition,
+        audio::FramePos endPosition) const {
+    // find first beat in range
+    audio::FramePos firstBeatPos = findNextBeat(startPosition);
+    // always >= 0
+    audio::FrameDiff_t startBeatOffset = firstBeatPos - startPosition;
+
+    // shift range to start at firstBeatPos
+    audio::FramePos newEnd = endPosition + startBeatOffset;
+    // find last beat in shifted range
+    audio::FramePos newEndBeatPos = findPrevBeat(newEnd);
+    const auto newEndBeat = iteratorFrom(newEndBeatPos);
+
+    double intPart = numBeatsInRange(firstBeatPos, newEndBeatPos);
+
+    // always >= 0
+    audio::FrameDiff_t endOffset = newEnd - newEndBeatPos;
+    double fractPart = endOffset / newEndBeat.beatLengthFrames();
+    return intPart + fractPart;
+}
+
 audio::FramePos Beats::findNextBeat(audio::FramePos position) const {
     return findNthBeat(position, 1);
 }

diff --git a/src/track/beats.h b/src/track/beats.h
@@ -350,6 +350,8 @@ class Beats : private std::enable_shared_from_this<Beats> {
     audio::FramePos snapPosToNearBeat(audio::FramePos position) const;
 
     int numBeatsInRange(audio::FramePos startPosition, audio::FramePos endPosition) const;
+    double numFractionalBeatsInRange(audio::FramePos startPosition,
+            audio::FramePos endPosition) const;
 
     /// Find the frame position N beats away from `position`. The number of beats may be
     /// negative and does not need to be an integer. In this case the returned position will