From 70f06394fb47a73fd38a813dddf12b5c964138a2 Mon Sep 17 00:00:00 2001
From: Antoine C <mixxx@acolombier.dev>
Date: Tue, 6 Feb 2024 23:55:31 +0000
Subject: [PATCH 1/5] feat: add beatloop anchor to set and adjust loop from
 either start or end

---
 .../classic/buttons/btn__loop_anchor_end.svg  |  50 +++++++++
 .../buttons/btn__loop_anchor_start.svg        |  50 +++++++++
 .../controls/button_2state_persist.xml        |   6 +-
 .../decks/row_5_transportLoopJump.xml         |  11 +-
 .../palemoon/buttons/btn__loop_anchor_end.svg |  67 ++++++++++++
 .../buttons/btn__loop_anchor_start.svg        |  67 ++++++++++++
 res/skins/LateNight/style_classic.qss         |  10 +-
 res/skins/LateNight/style_palemoon.qss        |   7 ++
 src/controllers/controlpickermenu.cpp         |   5 +
 src/engine/controls/loopingcontrol.cpp        | 101 +++++++++++++-----
 src/engine/controls/loopingcontrol.h          |  10 +-
 src/skin/legacy/tooltips.cpp                  |   5 +
 src/test/looping_control_test.cpp             |  18 +++-
 13 files changed, 372 insertions(+), 35 deletions(-)
 create mode 100644 res/skins/LateNight/classic/buttons/btn__loop_anchor_end.svg
 create mode 100644 res/skins/LateNight/classic/buttons/btn__loop_anchor_start.svg
 create mode 100644 res/skins/LateNight/palemoon/buttons/btn__loop_anchor_end.svg
 create mode 100644 res/skins/LateNight/palemoon/buttons/btn__loop_anchor_start.svg

diff --git a/res/skins/LateNight/classic/buttons/btn__loop_anchor_end.svg b/res/skins/LateNight/classic/buttons/btn__loop_anchor_end.svg
new file mode 100644
index 00000000000..83862602730
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__loop_anchor_end.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   version="1.1"
+   id="svg6"
+   viewBox="0 0 24 24"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#918273;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+     d="m 11,3.9999464 -7,3.75 7,3.7499996 V 8.509712 h 3.490234 V 17.49018 H 13 v 1.509766 h 1.761719 C 15.469321,18.999946 16,18.384365 16,17.720649 V 8.2792433 C 16,7.6155271 15.46932,6.9999464 14.761719,6.9999464 H 11 Z"
+     id="path880-5" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#d2d2d1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+     d="M 10.433594,6.9999464 V 8.509712 h 4.05664 V 17.49018 H 13 v 1.509766 h 1.761719 C 15.469321,18.999946 16,18.384365 16,17.720649 V 8.2792433 C 16,7.6155271 15.46932,6.9999464 14.761719,6.9999464 Z"
+     id="path849" />
+  <path
+     id="path903"
+     d="M 4,7.749946 11,3.9999464 V 11.499946 Z"
+     style="fill:#d2d2d1;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     id="path8889-9"
+     d="m 13.179059,12.768008 c 0,0 0.004,-1.573482 0,-2.045454 -0.004,-0.472173 0.166702,-1.8758036 2.028135,-1.8881056 1.849472,-0.01225 2.054721,1.4159896 2.056058,2.2028026 8.02e-4,0.472036 0,1.730828 0,1.730828"
+     fill="none"
+     stroke="#ff6600"
+     stroke-width="1.09316" />
+  <path
+     id="rect8885-1"
+     d="m 12.12755,12.589203 c -0.309411,0 -0.619297,0.296801 -0.619297,0.593689 v 3.103906 c 0,0.296887 0.309894,0.593689 0.619297,0.593689 h 6.187181 c 0.309411,0 0.619297,-0.296802 0.619297,-0.593689 v -3.103906 c 0,-0.296888 -0.309894,-0.593689 -0.619297,-0.593689 z m 0.865849,1.430437 h 4.455483 c 0.205695,0 0.37129,0.159494 0.37129,0.35761 0,0.198115 -0.165595,0.357609 -0.37129,0.357609 h -4.455483 c -0.205695,0 -0.37129,-0.159494 -0.37129,-0.357609 0,-0.198116 0.165595,-0.35761 0.37129,-0.35761 z m 0,1.430438 h 4.455483 c 0.205695,0 0.37129,0.159494 0.37129,0.357609 0,0.198116 -0.165595,0.35761 -0.37129,0.35761 h -4.455483 c -0.205695,0 -0.37129,-0.159494 -0.37129,-0.35761 0,-0.198115 0.165595,-0.357609 0.37129,-0.357609 z"
+     color="#000001"
+     fill="#ff6600"
+     style="text-indent:0;text-decoration-line:none;text-transform:none;stroke-width:0.728771" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__loop_anchor_start.svg b/res/skins/LateNight/classic/buttons/btn__loop_anchor_start.svg
new file mode 100644
index 00000000000..c43541f5c67
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__loop_anchor_start.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   version="1.1"
+   id="svg6"
+   viewBox="0 0 24 24"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#918273;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+     d="M 9.2382812,5.9999996 C 8.5306802,5.9999996 8,6.6155811 8,7.2792965 V 16.720703 C 8,17.384418 8.5306796,18 9.2382812,18 H 13 v 3 l 7,-3.75 -7,-3.75 v 2.990234 H 9.5097656 V 7.5097652 H 11 V 5.9999996 Z"
+     id="path853" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#d2d2d1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+     d="M 9.2382812,5.9999996 C 8.5306802,5.9999996 8,6.6155811 8,7.2792965 V 16.720703 C 8,17.384418 8.5306796,18 9.2382812,18 H 13.566406 V 16.490234 H 9.5097656 V 7.5097652 H 11 V 5.9999996 Z"
+     id="path880" />
+  <path
+     id="path905"
+     d="M 13,13.5 V 21 l 7,-3.75 z"
+     style="fill:#d2d2d1;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     id="path8889-9"
+     d="m 6.6700189,11.594636 c 0,0 0.004,-1.573482 0,-2.0454543 -0.004,-0.4721731 0.1667019,-1.8758042 2.0281356,-1.888106 1.8494715,-0.012245 2.0547205,1.4159901 2.0560575,2.2028027 8.02e-4,0.4720366 0,1.7308286 0,1.7308286"
+     fill="none"
+     stroke="#ff6600"
+     stroke-width="1.09316" />
+  <path
+     id="rect8885-1"
+     d="m 5.6185102,11.415831 c -0.309411,0 -0.6192972,0.296801 -0.6192972,0.593689 v 3.103906 c 0,0.296887 0.3098937,0.593689 0.6192972,0.593689 h 6.1871808 c 0.309411,0 0.619297,-0.296802 0.619297,-0.593689 V 12.00952 c 0,-0.296888 -0.309894,-0.593689 -0.619297,-0.593689 z m 0.8658487,1.430437 h 4.4554831 c 0.205695,0 0.37129,0.159494 0.37129,0.35761 0,0.198115 -0.165595,0.357609 -0.37129,0.357609 H 6.4843589 c -0.2056947,0 -0.3712902,-0.159494 -0.3712902,-0.357609 0,-0.198116 0.1655955,-0.35761 0.3712902,-0.35761 z m 0,1.430438 h 4.4554831 c 0.205695,0 0.37129,0.159494 0.37129,0.357609 0,0.198116 -0.165595,0.35761 -0.37129,0.35761 H 6.4843589 c -0.2056947,0 -0.3712902,-0.159494 -0.3712902,-0.35761 0,-0.198115 0.1655955,-0.357609 0.3712902,-0.357609 z"
+     color="#000001"
+     fill="#ff6600"
+     style="text-indent:0;text-decoration-line:none;text-transform:none;stroke-width:0.728771" />
+</svg>
diff --git a/res/skins/LateNight/controls/button_2state_persist.xml b/res/skins/LateNight/controls/button_2state_persist.xml
index 124e28c04a3..beab021f15d 100644
--- a/res/skins/LateNight/controls/button_2state_persist.xml
+++ b/res/skins/LateNight/controls/button_2state_persist.xml
@@ -24,14 +24,14 @@ Variables:
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
       <Unpressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
-      <Pressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_pressed.svg</Pressed>
+      <Pressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Unpressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
-      <Pressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_pressed.svg</Pressed>
+      <Unpressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skins:LateNight/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/LateNight/decks/row_5_transportLoopJump.xml b/res/skins/LateNight/decks/row_5_transportLoopJump.xml
index 8a5c8ac5a9c..f4a6c276131 100644
--- a/res/skins/LateNight/decks/row_5_transportLoopJump.xml
+++ b/res/skins/LateNight/decks/row_5_transportLoopJump.xml
@@ -230,7 +230,7 @@
             <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
             <MinimumSize>78,52</MinimumSize>
-            <MaximumSize>86,52</MaximumSize>
+            <MaximumSize>104,52</MaximumSize>
             <Children>
               <WidgetGroup><!-- loop enable + beatloop size -->
                 <ObjectName>AlignLeftTop</ObjectName>
@@ -251,7 +251,7 @@
                     <ObjectName>Spinbox_<Variable name="BtnType"/></ObjectName>
                     <SizePolicy>me,min</SizePolicy>
                     <MinimumSize>46,26</MinimumSize>
-                    <MaximumSize>72,26</MaximumSize>
+                    <MaximumSize>77,26</MaximumSize>
                     <Value><Variable name="Group"/>,beatloop_size</Value>
                     <!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
                     <Connection>
@@ -290,6 +290,13 @@
                     <SetVariable name="ConfigKey"><Variable name="Group"/>,loop_out</SetVariable>
                     <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,loop_out_goto</SetVariable>
                   </Template>
+
+                  <Template src="skins:LateNight/controls/button_2state_persist.xml">
+                    <SetVariable name="TooltipId">loop_anchor</SetVariable>
+                    <SetVariable name="ObjectName">LoopAnchor</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,loop_anchor</SetVariable>
+                  </Template>
                 </Children>
               </WidgetGroup>
             </Children>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_end.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_end.svg
new file mode 100644
index 00000000000..2ca5921d7e9
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_end.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   version="1.1"
+   viewBox="0 0 24 24"
+   id="svg440"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <g
+     display="none"
+     opacity=".360743"
+     id="g432">
+    <g
+       fill="none"
+       stroke="#000001"
+       stroke-linejoin="round"
+       stroke-width="1.6"
+       id="g426">
+      <path
+         d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z"
+         color="#000001"
+         id="path422" />
+      <path
+         d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z"
+         color="#000001"
+         id="path424" />
+    </g>
+    <path
+       d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z"
+       fill="#918273"
+       id="path428" />
+    <path
+       d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z"
+       color="#000001"
+       fill="#918273"
+       id="path430" />
+  </g>
+  <path
+     d="m11 3.99995-7 3.75 7 3.75v-2.99023h3.49023v8.98047h-1.49023v1.50977h1.76172c0.707602 0 1.23828-0.615581 1.23828-1.2793v-9.44141c0-0.663716-0.53068-1.2793-1.23828-1.2793h-3.76172z"
+     fill="#918273"
+     stroke="#000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="1.6"
+     id="path434" />
+  <path
+     d="m10.4336 6.99995v1.50977h4.05664v8.98047h-1.49023v1.50977h1.76172c0.707602 0 1.23828-0.615581 1.23828-1.2793v-9.44141c0-0.663716-0.53068-1.2793-1.23828-1.2793z"
+     fill="#918273"
+     id="path436" />
+  <path
+     d="m4 7.74995 7-3.75v7.5z"
+     fill="#918273"
+     id="path438" />
+  <path
+     id="path8889-9"
+     d="m 13.212439,12.667869 c 0,0 0.004,-1.573482 0,-2.045454 -0.004,-0.472173 0.166702,-1.8758034 2.028135,-1.8881054 1.849472,-0.01225 2.054721,1.4159894 2.056058,2.2028024 8.02e-4,0.472036 0,1.730828 0,1.730828"
+     fill="none"
+     stroke="#ff6600"
+     stroke-width="1.09316" />
+  <path
+     id="rect8885-1"
+     d="m 12.16093,12.489064 c -0.309411,0 -0.619297,0.296801 -0.619297,0.593689 v 3.103906 c 0,0.296887 0.309894,0.593689 0.619297,0.593689 h 6.187181 c 0.309411,0 0.619297,-0.296802 0.619297,-0.593689 v -3.103906 c 0,-0.296888 -0.309894,-0.593689 -0.619297,-0.593689 z m 0.865849,1.430437 h 4.455483 c 0.205695,0 0.37129,0.159494 0.37129,0.35761 0,0.198115 -0.165595,0.357609 -0.37129,0.357609 h -4.455483 c -0.205695,0 -0.37129,-0.159494 -0.37129,-0.357609 0,-0.198116 0.165595,-0.35761 0.37129,-0.35761 z m 0,1.430438 h 4.455483 c 0.205695,0 0.37129,0.159494 0.37129,0.357609 0,0.198116 -0.165595,0.35761 -0.37129,0.35761 h -4.455483 c -0.205695,0 -0.37129,-0.159494 -0.37129,-0.35761 0,-0.198115 0.165595,-0.357609 0.37129,-0.357609 z"
+     color="#000001"
+     fill="#ff6600"
+     style="text-indent:0;text-decoration-line:none;text-transform:none;stroke-width:0.728771" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_start.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_start.svg
new file mode 100644
index 00000000000..e77fd66e141
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_start.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   version="1.1"
+   viewBox="0 0 24 24"
+   id="svg597"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <g
+     display="none"
+     opacity=".360743"
+     id="g589">
+    <g
+       fill="none"
+       stroke="#000001"
+       stroke-linejoin="round"
+       stroke-width="1.6"
+       id="g583">
+      <path
+         d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z"
+         color="#000001"
+         id="path579" />
+      <path
+         d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z"
+         color="#000001"
+         id="path581" />
+    </g>
+    <path
+       d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z"
+       fill="#918273"
+       id="path585" />
+    <path
+       d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z"
+       color="#000001"
+       fill="#918273"
+       id="path587" />
+  </g>
+  <path
+     d="m9.23828 6c-0.707601 0-1.23828 0.615582-1.23828 1.2793v9.44141c0 0.663715 0.53068 1.2793 1.23828 1.2793h3.76172v3l7-3.75-7-3.75v2.99023h-3.49023v-8.98047h1.49023v-1.50977z"
+     fill="#918273"
+     stroke="#000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="1.6"
+     id="path591" />
+  <path
+     d="m9.23828 6c-0.707601 0-1.23828 0.615582-1.23828 1.2793v9.44141c0 0.663715 0.53068 1.2793 1.23828 1.2793h4.32812v-1.50977h-4.05664v-8.98047h1.49023v-1.50977z"
+     fill="#918273"
+     id="path593" />
+  <path
+     d="m13 13.5v7.5l7-3.75z"
+     fill="#918273"
+     id="path595" />
+  <path
+     id="path8889-9"
+     d="m 6.770158,11.594636 c 0,0 0.004,-1.573481 0,-2.0454542 -0.004,-0.4721731 0.166702,-1.8758042 2.028135,-1.888106 1.849471,-0.012245 2.05472,1.4159901 2.056057,2.2028022 8.02e-4,0.472037 0,1.730829 0,1.730829"
+     fill="none"
+     stroke="#ff6600"
+     stroke-width="1.09316" />
+  <path
+     id="rect8885-1"
+     d="m 5.718649,11.415831 c -0.309411,0 -0.619297,0.296801 -0.619297,0.593689 v 3.103906 c 0,0.296887 0.309894,0.593689 0.619297,0.593689 h 6.18718 c 0.309411,0 0.619297,-0.296802 0.619297,-0.593689 V 12.00952 c 0,-0.296888 -0.309893,-0.593689 -0.619297,-0.593689 z m 0.865849,1.430437 h 4.455482 c 0.205695,0 0.371291,0.159494 0.371291,0.35761 0,0.198115 -0.165596,0.357609 -0.371291,0.357609 H 6.584498 c -0.205695,0 -0.37129,-0.159494 -0.37129,-0.357609 0,-0.198116 0.165595,-0.35761 0.37129,-0.35761 z m 0,1.430438 h 4.455482 c 0.205695,0 0.371291,0.159494 0.371291,0.357609 0,0.198116 -0.165596,0.35761 -0.371291,0.35761 H 6.584498 c -0.205695,0 -0.37129,-0.159494 -0.37129,-0.35761 0,-0.198115 0.165595,-0.357609 0.37129,-0.357609 z"
+     color="#000001"
+     fill="#ff6600"
+     style="text-indent:0;text-decoration-line:none;text-transform:none;stroke-width:0.728771" />
+</svg>
diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss
index 7f6e00aeb02..00236f6d910 100644
--- a/res/skins/LateNight/style_classic.qss
+++ b/res/skins/LateNight/style_classic.qss
@@ -1390,7 +1390,7 @@ WPushButton#LibExpand,
 
 /* top-level buttons in transport, fx, micaux and others */
 #BeatgridControls WPushButton[displayValue="0"],
-#DeckRow_5_LoopCuesTransport WPushButton[displayValue="0"],
+#DeckRow_5_LoopCuesTransport WPushButton,
 #PlayCueMini WPushButton[displayValue="0"],
 WPushButton#CueDeck[displayValue="0"],
 WPushButton#PlayIndicator[value="0"],
@@ -1438,7 +1438,7 @@ WPushButton#PlayIndicator[displayValue="1"],
 #CueDeck[displayValue="1"],
 WPushButton#Reverse[pressed="true"],
 #KeyControls WPushButton[pressed="true"],
-#LoopControls WPushButton[value="1"],
+#LoopControls WPushButton[pressed="true"],
 #LoopActivate[displayValue="1"],
 #BeatjumpControls WPushButton[value="1"],
 #EQKillButtonBox WPushButton[displayValue="1"],
@@ -1707,6 +1707,12 @@ WPushButton#SamplerExpand[displayValue="0"],
 #LoopOut {
   image: url(skins:LateNight/classic/buttons/btn__loop_out.svg) no-repeat center center;
 }
+#LoopAnchor[displayValue="0"] {
+  image: url(skins:LateNight/classic/buttons/btn__loop_anchor_start.svg) no-repeat center center;
+  }
+  #LoopAnchor[displayValue="1"] {
+    image: url(skins:LateNight/classic/buttons/btn__loop_anchor_end.svg) no-repeat center center;
+  }
 
 #JumpForward {
   image: url(skins:LateNight/classic/buttons/btn__beatjump_right.svg) no-repeat center center;
diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
index 915e54e762a..ef6cd338a7a 100644
--- a/res/skins/LateNight/style_palemoon.qss
+++ b/res/skins/LateNight/style_palemoon.qss
@@ -1669,6 +1669,7 @@ QPushButton#pushButtonAnalyze:checked {
 #SyncLeader[value="1"],
 WPushButton#LoopIn[pressed="true"],
 WPushButton#LoopOut[pressed="true"],
+WPushButton#LoopAnchor[pressed="true"],
 #BeatjumpControls WPushButton[value="1"],
 #RateControls WPushButton[value="1"],
 #BeatgridControls WPushButton[pressed="true"]/*,
@@ -2076,6 +2077,12 @@ WPushButton#PlayDeck[value="0"] {
   #LoopOut[pressed="true"] {
     image: url(skins:LateNight/palemoon/buttons/btn__loop_out_active.svg) no-repeat center center;
   }
+#LoopAnchor[displayValue="0"] {
+  image: url(skins:LateNight/palemoon/buttons/btn__loop_anchor_start.svg) no-repeat center center;
+  }
+  #LoopAnchor[displayValue="1"] {
+    image: url(skins:LateNight/palemoon/buttons/btn__loop_anchor_end.svg) no-repeat center center;
+  }
 
 #JumpForward {
   image: url(skins:LateNight/palemoon/buttons/btn__beatjump_right.svg) no-repeat center center;
diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
index c3a1c9b0666..bdd5490d4c1 100644
--- a/src/controllers/controlpickermenu.cpp
+++ b/src/controllers/controlpickermenu.cpp
@@ -671,6 +671,11 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
                "enabled, move the loop backward by the selected number of "
                "beats"),
             pBeatJumpMenu);
+    addDeckControl("loop_anchor",
+            tr("Beat Jump"),
+            tr("Indicate which loop marker remain static when adjusting the "
+               "size or is inherited from the current position"),
+            pBeatJumpMenu);
     pBeatJumpMenu->addSeparator();
 
     QMenu* beatjumpFwdSubmenu = addSubmenu(tr("Beat Jump / Loop Move Forward"), pBeatJumpMenu);
diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp
index d14a498b60d..061791837e1 100644
--- a/src/engine/controls/loopingcontrol.cpp
+++ b/src/engine/controls/loopingcontrol.cpp
@@ -136,6 +136,10 @@ LoopingControl::LoopingControl(const QString& group,
             this,
             [this](double value) { slotBeatLoop(value); },
             Qt::DirectConnection);
+    m_pCOLoopAnchor = new ControlPushButton(ConfigKey(group, "loop_anchor"),
+            true,
+            static_cast<double>(LoopAnchorPoint::Start));
+    m_pCOLoopAnchor->setButtonMode(ControlPushButton::TOGGLE);
 
     m_pCOBeatLoopSize = new ControlObject(ConfigKey(group, "beatloop_size"),
                                           true, false, false, 4.0);
@@ -269,6 +273,7 @@ LoopingControl::~LoopingControl() {
         delete pBeatLoop;
     }
     delete m_pCOBeatLoopSize;
+    delete m_pCOLoopAnchor;
     delete m_pCOBeatLoopActivate;
     delete m_pCOBeatLoopRollActivate;
 
@@ -1408,9 +1413,9 @@ mixxx::audio::FramePos LoopingControl::findQuantizedBeatloopStart(
     return previousFractionBeatPosition + loopLength;
 }
 
-void LoopingControl::slotBeatLoop(double beats, bool keepStartPoint, bool enable) {
+void LoopingControl::slotBeatLoop(double beats, bool keepSetPoint, bool enable) {
     // If this is a "new" loop, stop tracking saved loop changes
-    if (!keepStartPoint) {
+    if (!keepSetPoint) {
         emit loopReset();
     }
 
@@ -1442,6 +1447,7 @@ void LoopingControl::slotBeatLoop(double beats, bool keepStartPoint, bool enable
         return;
     }
 
+    const LoopAnchorPoint loopAnchor = static_cast<LoopAnchorPoint>(m_pCOLoopAnchor->get());
     // Calculate the new loop start and end positions
     // give start and end defaults so we can detect problems
     LoopInfo newloopInfo = {mixxx::audio::kInvalidFramePos,
@@ -1451,12 +1457,18 @@ void LoopingControl::slotBeatLoop(double beats, bool keepStartPoint, bool enable
     mixxx::audio::FramePos currentPosition = info.currentPosition;
     // Start from the current position/closest beat and
     // create the loop around X beats from there.
-    if (keepStartPoint) {
-        if (loopInfo.startPosition.isValid()) {
-            newloopInfo.startPosition = loopInfo.startPosition;
-        } else {
-            newloopInfo.startPosition =
-                    math_min(info.currentPosition, info.trackEndPosition);
+    if (keepSetPoint) {
+        switch (loopAnchor) {
+        case LoopAnchorPoint::Start:
+            newloopInfo.startPosition = loopInfo.startPosition.isValid()
+                    ? loopInfo.startPosition
+                    : math_min(info.currentPosition, info.trackEndPosition);
+            break;
+        case LoopAnchorPoint::End:
+            newloopInfo.endPosition = loopInfo.endPosition.isValid()
+                    ? loopInfo.endPosition
+                    : math_min(info.currentPosition, info.trackEndPosition);
+            break;
         }
     } else {
         // If running reverse, move the loop one loop size to the left.
@@ -1470,23 +1482,42 @@ void LoopingControl::slotBeatLoop(double beats, bool keepStartPoint, bool enable
             currentPosition = pBeats->findNBeatsFromPosition(currentPosition, -beats);
         }
 
-        if (!m_pQuantizeEnabled->toBool()) {
-            newloopInfo.startPosition = currentPosition;
-        } else {
-            // loop_in is set to the closest beat if quantize is on and the loop size is >= 1 beat.
-            // The closest beat might be ahead of play position and will cause a catching loop.
-            newloopInfo.startPosition = findQuantizedBeatloopStart(pBeats, currentPosition, beats);
+        bool quantize = m_pQuantizeEnabled->toBool();
+        // loop_in is set to the closest beat if quantize is on and the loop size is >= 1 beat.
+        // The closest beat might be ahead of play position and will cause a catching loop.
+        switch (loopAnchor) {
+        case LoopAnchorPoint::Start:
+            newloopInfo.startPosition = !quantize
+                    ? currentPosition
+                    : findQuantizedBeatloopStart(
+                              pBeats, currentPosition, beats);
+            break;
+        case LoopAnchorPoint::End:
+            newloopInfo.endPosition = !quantize
+                    ? currentPosition
+                    : findQuantizedBeatloopStart(
+                              pBeats, currentPosition, beats);
+            break;
         }
     }
 
-    newloopInfo.endPosition = pBeats->findNBeatsFromPosition(newloopInfo.startPosition, beats);
+    switch (loopAnchor) {
+    case LoopAnchorPoint::Start:
+        newloopInfo.endPosition = pBeats->findNBeatsFromPosition(newloopInfo.startPosition, beats);
+        break;
+    case LoopAnchorPoint::End:
+        newloopInfo.startPosition = pBeats->findNBeatsFromPosition(newloopInfo.endPosition, -beats);
+        break;
+    }
 
     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
+            || (newloopInfo.endPosition > trackEndPosition &&
+                       (enable || m_bLoopingEnabled))) { // Do not allow beat
+                                                         // loops to go beyond
+                                                         // the end of the track
         // 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
@@ -1523,16 +1554,34 @@ void LoopingControl::slotBeatLoop(double beats, bool keepStartPoint, bool enable
         return;
     }
 
-    // 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;
+    switch (loopAnchor) {
+    case LoopAnchorPoint::Start:
+        // 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 (!keepSetPoint ||
+                !(enable || m_bLoopingEnabled) ||
+                (positionNear(newloopInfo.startPosition, loopInfo.startPosition) &&
+                        positionNear(newloopInfo.endPosition, loopInfo.endPosition))) {
+            newloopInfo.seekMode = LoopSeekMode::MovedOut;
+        } else {
+            newloopInfo.seekMode = LoopSeekMode::Changed;
+        }
+        break;
+    case LoopAnchorPoint::End:
+        // If the end point is behind the current position and the loop is enabled, seek backward .
+        if (!(enable || m_bLoopingEnabled) || newloopInfo.endPosition > currentPosition) {
+            newloopInfo.seekMode = LoopSeekMode::MovedOut;
+        } else {
+            newloopInfo.seekMode = LoopSeekMode::Changed;
+            // If the loop is being enabled, flush the old loop status to force
+            // LoopingControl::nextTrigger to evaluate the LoopSeekMode
+            if (!m_bLoopingEnabled) {
+                m_oldLoopInfo = LoopInfo{};
+            }
+        }
+        break;
     }
+
     m_loopInfo.setValue(newloopInfo);
     emit loopUpdated(newloopInfo.startPosition, newloopInfo.endPosition);
     m_pCOLoopStartPosition->set(newloopInfo.startPosition.toEngineSamplePos());
diff --git a/src/engine/controls/loopingcontrol.h b/src/engine/controls/loopingcontrol.h
index 96167a41927..3bd37f9314a 100644
--- a/src/engine/controls/loopingcontrol.h
+++ b/src/engine/controls/loopingcontrol.h
@@ -63,6 +63,13 @@ class LoopingControl : public EngineControl {
         None,
     };
 
+    enum class LoopAnchorPoint {
+        Start, // The loop has been defined by its start point. Adjusting the
+               // size will move the end point
+        End,   // The loop has been defined by its end point. Adjusting the size
+               // will move the end point
+    };
+
     struct LoopInfo {
         mixxx::audio::FramePos startPosition;
         mixxx::audio::FramePos endPosition;
@@ -114,7 +121,7 @@ class LoopingControl : public EngineControl {
 
     // Generate a loop of 'beats' length. It can also do fractions for a
     // beatslicing effect.
-    void slotBeatLoop(double loopSize, bool keepStartPoint=false, bool enable=true);
+    void slotBeatLoop(double loopSize, bool keepSetPoint = false, bool enable = true);
     void slotBeatLoopSizeChangeRequest(double beats);
     void slotBeatLoopToggle(double pressed);
     void slotBeatLoopRollActivate(double pressed);
@@ -174,6 +181,7 @@ class LoopingControl : public EngineControl {
     ControlObject* m_pCOLoopStartPosition;
     ControlObject* m_pCOLoopEndPosition;
     ControlObject* m_pCOLoopEnabled;
+    ControlPushButton* m_pCOLoopAnchor;
     ControlPushButton* m_pLoopInButton;
     ControlPushButton* m_pLoopInGotoButton;
     ControlPushButton* m_pLoopOutButton;
diff --git a/src/skin/legacy/tooltips.cpp b/src/skin/legacy/tooltips.cpp
index 388f8b49da8..e4fd23c5ced 100644
--- a/src/skin/legacy/tooltips.cpp
+++ b/src/skin/legacy/tooltips.cpp
@@ -741,6 +741,11 @@ void Tooltips::addStandardTooltips() {
             << QString("%1: %2").arg(rightClick, tr("Temporarily enable a rolling loop over the set number of beats."))
             << tr("Playback will resume where the track would have been if it had not entered the loop.");
 
+    add("loop_anchor")
+            << tr("Beatloop")
+            << tr("Define whether the loop is defined and adjusted from its "
+                  "staring point or ending point.");
+
     add("beatjump_size")
             << tr("Beatjump/Loop Move Size")
             << tr("Select the number of beats to jump or move the loop with the Beatjump Forward/Backward buttons.");
diff --git a/src/test/looping_control_test.cpp b/src/test/looping_control_test.cpp
index 7c56735ad7e..1df6957689e 100644
--- a/src/test/looping_control_test.cpp
+++ b/src/test/looping_control_test.cpp
@@ -733,12 +733,28 @@ TEST_F(LoopingControlTest, BeatLoopSize_IgnoresPastTrackEnd) {
     m_pTrack1->trySetBpm(60.0);
     setCurrentPosition(mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
                                m_pTrackSamples->get()) -
-            200);
+            44100);
+    m_pBeatLoopSize->set(0.5);
+    m_pButtonBeatLoopActivate->set(1.0);
+    m_pButtonBeatLoopActivate->set(0.0);
+    EXPECT_TRUE(m_pLoopEnabled->toBool());
     m_pBeatLoopSize->set(64.0);
     EXPECT_NE(64.0, m_pBeatLoopSize->get());
     EXPECT_FALSE(m_pBeatLoop64Enabled->toBool());
 }
 
+TEST_F(LoopingControlTest, BeatLoopSize_SetPastTrackEndIfLoopInactive) {
+    // TODO: actually calculate that the beatloop would go beyond
+    // the end of the track
+    m_pTrack1->trySetBpm(60.0);
+    setCurrentPosition(mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
+                               m_pTrackSamples->get()) -
+            44100);
+    m_pBeatLoopSize->set(64.0);
+    EXPECT_EQ(64.0, m_pBeatLoopSize->get());
+    EXPECT_FALSE(m_pBeatLoop64Enabled->toBool());
+}
+
 TEST_F(LoopingControlTest, BeatLoopSize_SetsNumberedControls) {
     m_pTrack1->trySetBpm(120.0);
     m_pBeatLoopSize->set(2.0);

From a31e516222bc5cf4caa3eafd90eb98b9bfe0e8be Mon Sep 17 00:00:00 2001
From: Antoine C <mixxx@acolombier.dev>
Date: Wed, 8 May 2024 19:10:32 +0100
Subject: [PATCH 2/5] Add beatloop reverse control for MIDI mapping

---
 src/controllers/controlpickermenu.cpp  |  21 +++++
 src/engine/controls/loopingcontrol.cpp | 108 ++++++++++++++++++++-----
 src/engine/controls/loopingcontrol.h   |  20 +++--
 3 files changed, 121 insertions(+), 28 deletions(-)

diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
index 181b4c86bd3..8f2a5f5a3f4 100644
--- a/src/controllers/controlpickermenu.cpp
+++ b/src/controllers/controlpickermenu.cpp
@@ -591,9 +591,16 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
     QString beatloopRollActivateTitle = tr("Loop Roll Selected Beats");
     QString beatloopRollActivateDescription = tr("Create a rolling beat loop of selected beat size");
     QString beatLoopTitle = tr("Loop %1 Beats");
+    QString reverseBeatLoopTitle = tr("Loop %1 Beats set from its exit point");
     QString beatLoopRollTitle = tr("Loop Roll %1 Beats");
+    QString reverseBeatLoopRollTitle = tr("Loop Roll %1 Beats set from its exit point");
     QString beatLoopDescription = tr("Create %1-beat loop");
+    QString reverseBeatLoopDescription = tr(
+            "Create %1-beat loop with the current play position as loop exit");
     QString beatLoopRollDescription = tr("Create temporary %1-beat loop roll");
+    QString reverseBeatLoopRollDescription =
+            tr("Create temporary %1-beat loop roll with the current play "
+               "position as loop exit");
 
     QList<double> beatSizes = LoopingControl::getBeatSizes();
 
@@ -624,6 +631,13 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
                 beatLoopDescription.arg(humanBeats),
                 pLoopActivateMenu);
     }
+    for (double beats : beatSizes) {
+        QString humanBeats = humanBeatSizes.value(beats, QString::number(beats));
+        addDeckControl(QString("beatloop_r%1_toggle").arg(beats),
+                reverseBeatLoopTitle.arg(humanBeats),
+                reverseBeatLoopDescription.arg(humanBeats),
+                pLoopActivateMenu);
+    }
     pLoopMenu->addSeparator();
 
     addDeckControl("beatlooproll_activate",
@@ -638,6 +652,13 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
                 beatLoopRollDescription.arg(humanBeats),
                 pLooprollActivateMenu);
     }
+    for (double beats : beatSizes) {
+        QString humanBeats = humanBeatSizes.value(beats, QString::number(beats));
+        addDeckControl(QString("beatlooproll_r%1_activate").arg(beats),
+                reverseBeatLoopRollTitle.arg(humanBeats),
+                reverseBeatLoopRollDescription.arg(humanBeats),
+                pLooprollActivateMenu);
+    }
     pLoopMenu->addSeparator();
 
     addDeckControl("loop_in", tr("Loop In"), tr("Loop In button"), pLoopMenu);
diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp
index 061791837e1..7a8e6350aaf 100644
--- a/src/engine/controls/loopingcontrol.cpp
+++ b/src/engine/controls/loopingcontrol.cpp
@@ -1920,49 +1920,74 @@ void LoopMoveControl::slotMoveForward(double v) {
 
 BeatLoopingControl::BeatLoopingControl(const QString& group, double size)
         : m_dBeatLoopSize(size),
-          m_bActive(false) {
+          m_bActive(false),
+          m_pCOLoopAnchor(std::make_unique<ControlProxy>(group, "loop_anchor", this)) {
     // This is the original beatloop control which is now deprecated. Its value
     // is the state of the beatloop control (1 for enabled, 0 for disabled).
-    m_pLegacy = new ControlPushButton(
+    m_pLegacy = std::make_unique<ControlPushButton>(
             keyForControl(group, "beatloop_%1", size));
     m_pLegacy->setButtonMode(ControlPushButton::TOGGLE);
-    connect(m_pLegacy, &ControlObject::valueChanged,
-            this, &BeatLoopingControl::slotLegacy,
+    connect(m_pLegacy.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BeatLoopingControl::slotLegacy,
             Qt::DirectConnection);
     // A push-button which activates the beatloop.
-    m_pActivate = new ControlPushButton(
+    m_pActivate = std::make_unique<ControlPushButton>(
             keyForControl(group, "beatloop_%1_activate", size));
-    connect(m_pActivate, &ControlObject::valueChanged,
-            this, &BeatLoopingControl::slotActivate,
+    connect(m_pActivate.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BeatLoopingControl::slotActivate,
+            Qt::DirectConnection);
+    // And the same but setting it from the end point instead of starting
+    m_pRActivate = std::make_unique<ControlPushButton>(
+            keyForControl(group, "beatloop_r%1_activate", size));
+    connect(m_pRActivate.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BeatLoopingControl::slotReverseActivate,
             Qt::DirectConnection);
     // A push-button which toggles the beatloop as active or inactive.
-    m_pToggle = new ControlPushButton(
+    m_pToggle = std::make_unique<ControlPushButton>(
             keyForControl(group, "beatloop_%1_toggle", size));
-    connect(m_pToggle, &ControlObject::valueChanged,
-            this, &BeatLoopingControl::slotToggle,
+    connect(m_pToggle.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BeatLoopingControl::slotToggle,
+            Qt::DirectConnection);
+    // And the same but setting it from the end point instead of starting
+    m_pRToggle = std::make_unique<ControlPushButton>(
+            keyForControl(group, "beatloop_r%1_toggle", size));
+    connect(m_pRToggle.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BeatLoopingControl::slotReverseToggle,
             Qt::DirectConnection);
 
     // A push-button which activates rolling beatloops
-    m_pActivateRoll = new ControlPushButton(
+    m_pActivateRoll = std::make_unique<ControlPushButton>(
             keyForControl(group, "beatlooproll_%1_activate", size));
-    connect(m_pActivateRoll, &ControlObject::valueChanged,
-            this, &BeatLoopingControl::slotActivateRoll,
+    connect(m_pActivateRoll.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BeatLoopingControl::slotActivateRoll,
+            Qt::DirectConnection);
+    // And the same but setting it from the end point instead of starting
+    m_pRActivateRoll = std::make_unique<ControlPushButton>(
+            keyForControl(group, "beatlooproll_r%1_activate", size));
+    connect(m_pRActivateRoll.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BeatLoopingControl::slotReverseActivateRoll,
             Qt::DirectConnection);
 
     // An indicator control which is 1 if the beatloop is enabled and 0 if not.
-    m_pEnabled = new ControlObject(
+    m_pEnabled = std::make_unique<ControlObject>(
             keyForControl(group, "beatloop_%1_enabled", size));
     m_pEnabled->setReadOnly();
 }
 
-BeatLoopingControl::~BeatLoopingControl() {
-    delete m_pActivate;
-    delete m_pToggle;
-    delete m_pEnabled;
-    delete m_pLegacy;
-    delete m_pActivateRoll;
-}
-
 void BeatLoopingControl::deactivate() {
     if (m_bActive) {
         m_bActive = false;
@@ -2016,3 +2041,42 @@ void BeatLoopingControl::slotToggle(double value) {
         emit activateBeatLoop(this);
     }
 }
+
+void BeatLoopingControl::slotReverseActivate(double value) {
+    bool isReverseAnchor = m_pCOLoopAnchor->toBool();
+    if (!isReverseAnchor) {
+        // If the reverse mode is not enabled, we do so temporarily
+        m_pCOLoopAnchor->set(1.0);
+    }
+    slotActivate(value);
+    if (!isReverseAnchor) {
+        // If the reverse mode was enabled temporarily, we disabled it now
+        m_pCOLoopAnchor->set(0.0);
+    }
+}
+
+void BeatLoopingControl::slotReverseActivateRoll(double v) {
+    bool isReverseAnchor = m_pCOLoopAnchor->toBool();
+    if (!isReverseAnchor) {
+        // If the reverse mode is not enabled, we do so temporarily
+        m_pCOLoopAnchor->set(1.0);
+    }
+    slotActivateRoll(v);
+    if (!isReverseAnchor) {
+        // If the reverse mode was enabled temporarily, we disabled it now
+        m_pCOLoopAnchor->set(0.0);
+    }
+}
+
+void BeatLoopingControl::slotReverseToggle(double value) {
+    bool isReverseAnchor = m_pCOLoopAnchor->toBool();
+    if (!isReverseAnchor) {
+        // If the reverse mode is not enabled, we do so temporarily
+        m_pCOLoopAnchor->set(1.0);
+    }
+    slotToggle(value);
+    if (!isReverseAnchor) {
+        // If the reverse mode was enabled temporarily, we disabled it now
+        m_pCOLoopAnchor->set(0.0);
+    }
+}
diff --git a/src/engine/controls/loopingcontrol.h b/src/engine/controls/loopingcontrol.h
index 3bd37f9314a..e5d891c585d 100644
--- a/src/engine/controls/loopingcontrol.h
+++ b/src/engine/controls/loopingcontrol.h
@@ -11,6 +11,7 @@
 
 class ControlPushButton;
 class ControlObject;
+class ControlProxy;
 class RateControl;
 class LoopMoveControl;
 class BeatJumpControl;
@@ -287,7 +288,6 @@ class BeatLoopingControl : public QObject {
     Q_OBJECT
   public:
     BeatLoopingControl(const QString& group, double size);
-    virtual ~BeatLoopingControl();
 
     void activate();
     void deactivate();
@@ -299,6 +299,10 @@ class BeatLoopingControl : public QObject {
     void slotActivate(double value);
     void slotActivateRoll(double value);
     void slotToggle(double value);
+  private slots:
+    void slotReverseActivate(double value);
+    void slotReverseActivateRoll(double value);
+    void slotReverseToggle(double value);
 
   signals:
     void activateBeatLoop(BeatLoopingControl*);
@@ -309,9 +313,13 @@ class BeatLoopingControl : public QObject {
   private:
     double m_dBeatLoopSize;
     bool m_bActive;
-    ControlPushButton* m_pLegacy;
-    ControlPushButton* m_pActivate;
-    ControlPushButton* m_pActivateRoll;
-    ControlPushButton* m_pToggle;
-    ControlObject* m_pEnabled;
+    std::unique_ptr<ControlPushButton> m_pLegacy;
+    std::unique_ptr<ControlPushButton> m_pActivate;
+    std::unique_ptr<ControlPushButton> m_pRActivate;
+    std::unique_ptr<ControlPushButton> m_pActivateRoll;
+    std::unique_ptr<ControlPushButton> m_pRActivateRoll;
+    std::unique_ptr<ControlPushButton> m_pToggle;
+    std::unique_ptr<ControlPushButton> m_pRToggle;
+    std::unique_ptr<ControlProxy> m_pCOLoopAnchor;
+    std::unique_ptr<ControlObject> m_pEnabled;
 };

From 8d0d6c74bd36e6e79972ba1b2ebd06275c67c2b8 Mon Sep 17 00:00:00 2001
From: Antoine C <mixxx@acolombier.dev>
Date: Thu, 9 May 2024 11:27:48 +0100
Subject: [PATCH 3/5] Add hint reader to smooth reverse loop and missing tests

---
 src/engine/controls/loopingcontrol.cpp |  17 +++
 src/test/looping_control_test.cpp      | 140 +++++++++++++++++++++++++
 2 files changed, 157 insertions(+)

diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp
index 7a8e6350aaf..a59e12833af 100644
--- a/src/engine/controls/loopingcontrol.cpp
+++ b/src/engine/controls/loopingcontrol.cpp
@@ -579,6 +579,23 @@ void LoopingControl::hintReader(gsl::not_null<HintVector*> pHintList) {
             loop_hint.frameCount = Hint::kFrameCountForward;
             pHintList->append(loop_hint);
         }
+        // We anticipate a potential loop being set from its end point
+        mixxx::BeatsPointer pBeats = m_pBeats;
+        if (!pBeats) {
+            return;
+        }
+        double beats = m_pCOBeatLoopSize->get();
+        bool quantize = m_pQuantizeEnabled->toBool();
+        auto currentPosition = !quantize
+                ? m_currentPosition.getValue()
+                : findQuantizedBeatloopStart(
+                          pBeats, m_currentPosition.getValue(), beats);
+        loop_hint.type = Hint::Type::LoopStart;
+        loop_hint.frame = static_cast<SINT>(
+                pBeats->findNBeatsFromPosition(currentPosition, -beats)
+                        .toLowerFrameBoundary()
+                        .value());
+        loop_hint.frameCount = Hint::kFrameCountForward;
     }
 }
 
diff --git a/src/test/looping_control_test.cpp b/src/test/looping_control_test.cpp
index 1df6957689e..2bb4632bfc2 100644
--- a/src/test/looping_control_test.cpp
+++ b/src/test/looping_control_test.cpp
@@ -26,6 +26,7 @@ class LoopingControlTest : public MockedEngineBackendTest {
         MockedEngineBackendTest::SetUp();
         m_pQuantizeEnabled = std::make_unique<PollingControlProxy>(m_sGroup1, "quantize");
         m_pQuantizeEnabled->set(1.0);
+        m_pSlipEnabled = std::make_unique<PollingControlProxy>(m_sGroup1, "slip_enabled");
         m_pNextBeat = std::make_unique<PollingControlProxy>(m_sGroup1, "beat_next");
 
         m_pNextBeat->set(-1);
@@ -81,6 +82,8 @@ class LoopingControlTest : public MockedEngineBackendTest {
                 m_sGroup1, "beatlooproll_2_activate");
         m_pButtonBeatLoopRoll4Activate = std::make_unique<PollingControlProxy>(
                 m_sGroup1, "beatlooproll_4_activate");
+        m_pButtonBeatLoopAnchor = std::make_unique<PollingControlProxy>(
+                m_sGroup1, "loop_anchor");
 
         ProcessBuffer();
     }
@@ -101,6 +104,7 @@ class LoopingControlTest : public MockedEngineBackendTest {
     std::unique_ptr<PollingControlProxy> m_pNextBeat;
     std::unique_ptr<PollingControlProxy> m_pClosestBeat;
     std::unique_ptr<PollingControlProxy> m_pQuantizeEnabled;
+    std::unique_ptr<PollingControlProxy> m_pSlipEnabled;
     std::unique_ptr<PollingControlProxy> m_pTrackSamples;
     std::unique_ptr<PollingControlProxy> m_pButtonLoopIn;
     std::unique_ptr<PollingControlProxy> m_pButtonLoopOut;
@@ -117,6 +121,7 @@ class LoopingControlTest : public MockedEngineBackendTest {
     std::unique_ptr<PollingControlProxy> m_pButtonPlay;
     std::unique_ptr<PollingControlProxy> m_pButtonBeatMoveForward;
     std::unique_ptr<PollingControlProxy> m_pButtonBeatMoveBackward;
+    std::unique_ptr<PollingControlProxy> m_pButtonBeatLoopAnchor;
     std::unique_ptr<PollingControlProxy> m_pButtonBeatLoop2Activate;
     std::unique_ptr<PollingControlProxy> m_pButtonBeatLoop4Activate;
     std::unique_ptr<PollingControlProxy> m_pBeatLoop1Enabled;
@@ -1203,3 +1208,138 @@ TEST_F(LoopingControlTest, BeatLoopRoll_StartPoint) {
     EXPECT_TRUE(m_pBeatLoop4Enabled->toBool());
     EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::kStartFramePos, m_pLoopStartPoint);
 }
+
+TEST_F(LoopingControlTest, LoopResizeUsingAnchor) {
+    // Activating a new loop with a loop active should warp the playposition
+    // the same as it does when we scale the loop larger and smaller so we
+    // keep in sync with the beat.
+
+    // Disable quantize for this test
+    m_pQuantizeEnabled->set(0.0);
+
+    m_pTrack1->trySetBpm(23520);
+    m_pLoopStartPoint->set(mixxx::audio::kStartFramePos.toEngineSamplePos());
+    m_pLoopEndPoint->set(mixxx::audio::FramePos{300}.toEngineSamplePos());
+    setCurrentPosition(mixxx::audio::FramePos{250});
+    m_pButtonReloopToggle->set(1);
+    EXPECT_TRUE(isLoopEnabled());
+    EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::kStartFramePos, m_pLoopStartPoint);
+    EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::FramePos{300}, m_pLoopEndPoint);
+    EXPECT_FRAMEPOS_EQ(mixxx::audio::FramePos{250}, currentFramePos());
+
+    // Set loop anchor to end
+    m_pButtonBeatLoopAnchor->set(1.0);
+    // Activate a shorter loop
+    m_pButtonBeatLoop2Activate->set(1.0);
+
+    ProcessBuffer();
+
+    // The loop is resized and we should have seeked to a mid-beat part of the
+    // loop.
+    EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::FramePos{75}, m_pLoopStartPoint);
+    EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::FramePos{300}, m_pLoopEndPoint);
+    ProcessBuffer();
+    EXPECT_FRAMEPOS_EQ(mixxx::audio::FramePos{250}, currentFramePos());
+
+    // But if looping is not enabled, no warping occurs.
+    m_pLoopStartPoint->set(mixxx::audio::kStartFramePos.toEngineSamplePos());
+    m_pLoopEndPoint->set(mixxx::audio::FramePos{300}.toEngineSamplePos());
+    setCurrentPosition(mixxx::audio::FramePos{250});
+    m_pButtonReloopToggle->set(1);
+    EXPECT_FALSE(isLoopEnabled());
+    EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::kStartFramePos, m_pLoopStartPoint);
+    EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::FramePos{300}, m_pLoopEndPoint);
+    EXPECT_FRAMEPOS_EQ(mixxx::audio::FramePos{250}, currentFramePos());
+
+    setCurrentPosition(mixxx::audio::FramePos{400});
+
+    m_pButtonBeatLoop2Activate->set(1.0);
+    ProcessBuffer();
+
+    EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::FramePos{175}, m_pLoopStartPoint);
+    EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::FramePos{400}, m_pLoopEndPoint);
+    EXPECT_FRAMEPOS_EQ(mixxx::audio::FramePos{400}, currentFramePos());
+
+    // Set loop anchor to start
+    m_pButtonBeatLoopAnchor->set(0.0);
+    // Activate a larger loop
+    m_pButtonBeatLoop4Activate->set(1.0);
+
+    ProcessBuffer();
+
+    // The loop is resized its end oint this time
+    EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::FramePos{175}, m_pLoopStartPoint);
+    EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::FramePos{625}, m_pLoopEndPoint);
+    ProcessBuffer();
+    EXPECT_FRAMEPOS_EQ(mixxx::audio::FramePos{175}, currentFramePos());
+}
+
+TEST_F(LoopingControlTest, LoopBeatloopReverse) {
+    // Activating a new loop with a loop active should warp the playposition
+    // the same as it does when we scale the loop larger and smaller so we
+    // keep in sync with the beat.
+
+    // Disable quantize for this test
+    m_pQuantizeEnabled->set(0.0);
+
+    m_pTrack1->trySetBpm(23520);
+
+    double dBeatSizes[] = {0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8};
+
+    // Test activate (only set the loop)
+    for (unsigned int i = 0; i < (sizeof(dBeatSizes) / sizeof(dBeatSizes[0])); ++i) {
+        m_pLoopEnabled->set(0.0);
+        EXPECT_FALSE(isLoopEnabled());
+        EXPECT_EQ(0.0, m_pButtonBeatLoopAnchor->get());
+        setCurrentPosition(mixxx::audio::FramePos{1000});
+        auto control = std::make_unique<PollingControlProxy>(
+                ConfigKey(m_sGroup1, QString("beatloop_r%1_activate").arg(dBeatSizes[i])));
+        control->set(1.0);
+        EXPECT_TRUE(isLoopEnabled());
+        EXPECT_FRAMEPOS_EQ_CONTROL(
+                mixxx::audio::FramePos{1000 - dBeatSizes[i] * 112.5},
+                m_pLoopStartPoint);
+        EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::FramePos{1000}, m_pLoopEndPoint);
+        EXPECT_EQ(0.0, m_pButtonBeatLoopAnchor->get());
+    }
+
+    // Test activate (set the loop and deactivate)
+    for (unsigned int i = 0; i < (sizeof(dBeatSizes) / sizeof(dBeatSizes[0])); ++i) {
+        m_pLoopEnabled->set(0.0);
+        EXPECT_FALSE(isLoopEnabled());
+        EXPECT_EQ(0.0, m_pButtonBeatLoopAnchor->get());
+        setCurrentPosition(mixxx::audio::FramePos{1000});
+        auto control = std::make_unique<PollingControlProxy>(
+                ConfigKey(m_sGroup1, QString("beatloop_r%1_toggle").arg(dBeatSizes[i])));
+        control->set(1.0);
+        EXPECT_TRUE(isLoopEnabled());
+        EXPECT_FRAMEPOS_EQ_CONTROL(
+                mixxx::audio::FramePos{1000 - dBeatSizes[i] * 112.5},
+                m_pLoopStartPoint);
+        EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::FramePos{1000}, m_pLoopEndPoint);
+        EXPECT_EQ(0.0, m_pButtonBeatLoopAnchor->get());
+        control->set(1.0);
+        EXPECT_FALSE(isLoopEnabled());
+        EXPECT_EQ(0.0, m_pButtonBeatLoopAnchor->get());
+    }
+
+    // Test roll activate (only set the loop and slip)
+    for (unsigned int i = 0; i < (sizeof(dBeatSizes) / sizeof(dBeatSizes[0])); ++i) {
+        EXPECT_FALSE(isLoopEnabled());
+        EXPECT_EQ(0.0, m_pButtonBeatLoopAnchor->get());
+        setCurrentPosition(mixxx::audio::FramePos{1000});
+        auto control = std::make_unique<PollingControlProxy>(
+                ConfigKey(m_sGroup1, QString("beatlooproll_r%1_activate").arg(dBeatSizes[i])));
+        control->set(1.0);
+        EXPECT_TRUE(isLoopEnabled());
+        EXPECT_EQ(1.0, m_pSlipEnabled->get());
+        EXPECT_FRAMEPOS_EQ_CONTROL(
+                mixxx::audio::FramePos{1000 - dBeatSizes[i] * 112.5},
+                m_pLoopStartPoint);
+        EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::FramePos{1000}, m_pLoopEndPoint);
+        EXPECT_EQ(0.0, m_pButtonBeatLoopAnchor->get());
+        m_pLoopEnabled->set(0.0);
+        EXPECT_FALSE(isLoopEnabled());
+        EXPECT_EQ(0.0, m_pSlipEnabled->get());
+    }
+}

From 80d372b6d0c12cbe569c1df22c7d3f1c89b687d5 Mon Sep 17 00:00:00 2001
From: Antoine C <mixxx@acolombier.dev>
Date: Mon, 13 May 2024 13:00:51 +0100
Subject: [PATCH 4/5] Update LateMoon button and tooltip

---
 .../classic/buttons/btn__loop_anchor_end.svg  | 103 +++++++++++++-----
 .../buttons/btn__loop_anchor_start.svg        | 103 +++++++++++++-----
 .../decks/row_5_transportLoopJump.xml         |   2 +-
 .../palemoon/buttons/btn__loop_anchor_end.svg |  60 +++++++---
 .../buttons/btn__loop_anchor_start.svg        |  40 +++++--
 src/controllers/controlpickermenu.cpp         |   8 +-
 6 files changed, 225 insertions(+), 91 deletions(-)

diff --git a/res/skins/LateNight/classic/buttons/btn__loop_anchor_end.svg b/res/skins/LateNight/classic/buttons/btn__loop_anchor_end.svg
index 83862602730..983c54aab41 100644
--- a/res/skins/LateNight/classic/buttons/btn__loop_anchor_end.svg
+++ b/res/skins/LateNight/classic/buttons/btn__loop_anchor_end.svg
@@ -3,48 +3,91 @@
    width="48"
    height="48"
    version="1.1"
-   id="svg6"
    viewBox="0 0 24 24"
+   id="svg597"
+   sodipodi:docname="btn__loop_anchor_end.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
-     id="defs10" />
+     id="defs87" />
+  <sodipodi:namedview
+     id="namedview85"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.333333"
+     inkscape:cx="14.742188"
+     inkscape:cy="24"
+     inkscape:window-width="2560"
+     inkscape:window-height="1275"
+     inkscape:window-x="26"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg597" />
+  <g
+     display="none"
+     opacity=".360743"
+     id="g589">
+    <g
+       fill="none"
+       stroke="#000001"
+       stroke-linejoin="round"
+       stroke-width="1.6"
+       id="g583">
+      <path
+         d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z"
+         color="#000001"
+         id="path579" />
+      <path
+         d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z"
+         color="#000001"
+         id="path581" />
+    </g>
+    <path
+       d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z"
+       fill="#d2d2d1"
+       id="path585" />
+    <path
+       d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z"
+       color="#000001"
+       fill="#d2d2d1"
+       id="path587" />
+  </g>
   <path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#918273;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-     d="m 11,3.9999464 -7,3.75 7,3.7499996 V 8.509712 h 3.490234 V 17.49018 H 13 v 1.509766 h 1.761719 C 15.469321,18.999946 16,18.384365 16,17.720649 V 8.2792433 C 16,7.6155271 15.46932,6.9999464 14.761719,6.9999464 H 11 Z"
-     id="path880-5" />
+     d="m 17.963408,19.38403 c 0.707601,0 1.23828,-0.615582 1.23828,-1.2793 V 8.6633198 c 0,-0.663715 -0.53068,-1.2793 -1.23828,-1.2793 h -3.761721 v -3 l -6.9999975,3.75 6.9999975,3.7500002 V 8.8937898 h 3.490231 V 17.87426 h -1.49023 v 1.50977 z"
+     fill="#d2d2d1"
+     stroke="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="1.6"
+     id="path591" />
   <path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#d2d2d1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-     d="M 10.433594,6.9999464 V 8.509712 h 4.05664 V 17.49018 H 13 v 1.509766 h 1.761719 C 15.469321,18.999946 16,18.384365 16,17.720649 V 8.2792433 C 16,7.6155271 15.46932,6.9999464 14.761719,6.9999464 Z"
-     id="path849" />
+     d="m 17.963408,19.38403 c 0.707601,0 1.23828,-0.615582 1.23828,-1.2793 V 8.6633198 c 0,-0.663715 -0.53068,-1.2793 -1.23828,-1.2793 h -4.328121 v 1.50977 h 4.056641 V 17.87426 h -1.49023 v 1.50977 z"
+     fill="#d2d2d1"
+     id="path593"
+     style="fill:#d2d2d1;fill-opacity:1" />
   <path
-     id="path903"
-     d="M 4,7.749946 11,3.9999464 V 11.499946 Z"
-     style="fill:#d2d2d1;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+     d="M 14.201687,11.88403 V 4.3840298 l -6.9999995,3.75 z"
+     fill="#d2d2d1"
+     id="path595"
+     style="fill:#d2d2d1;fill-opacity:1" />
   <path
      id="path8889-9"
-     d="m 13.179059,12.768008 c 0,0 0.004,-1.573482 0,-2.045454 -0.004,-0.472173 0.166702,-1.8758036 2.028135,-1.8881056 1.849472,-0.01225 2.054721,1.4159896 2.056058,2.2028026 8.02e-4,0.472036 0,1.730828 0,1.730828"
+     d="m 9.8876105,16.847945 c 0,0 -0.0048,-1.894694 0,-2.463016 0.0048,-0.568564 -0.200733,-2.258735 -2.442162,-2.273548 -2.227025,-0.01474 -2.474175,1.705053 -2.475784,2.652486 -9.97e-4,0.5684 0,2.084164 0,2.084164"
      fill="none"
      stroke="#ff6600"
-     stroke-width="1.09316" />
+     stroke-width="1.31632" />
   <path
      id="rect8885-1"
-     d="m 12.12755,12.589203 c -0.309411,0 -0.619297,0.296801 -0.619297,0.593689 v 3.103906 c 0,0.296887 0.309894,0.593689 0.619297,0.593689 h 6.187181 c 0.309411,0 0.619297,-0.296802 0.619297,-0.593689 v -3.103906 c 0,-0.296888 -0.309894,-0.593689 -0.619297,-0.593689 z m 0.865849,1.430437 h 4.455483 c 0.205695,0 0.37129,0.159494 0.37129,0.35761 0,0.198115 -0.165595,0.357609 -0.37129,0.357609 h -4.455483 c -0.205695,0 -0.37129,-0.159494 -0.37129,-0.357609 0,-0.198116 0.165595,-0.35761 0.37129,-0.35761 z m 0,1.430438 h 4.455483 c 0.205695,0 0.37129,0.159494 0.37129,0.357609 0,0.198116 -0.165595,0.35761 -0.37129,0.35761 h -4.455483 c -0.205695,0 -0.37129,-0.159494 -0.37129,-0.35761 0,-0.198115 0.165595,-0.357609 0.37129,-0.357609 z"
+     d="m 11.153776,16.63264 c 0.372575,0 0.745721,0.35739 0.745721,0.714885 v 3.737544 c 0,0.357495 -0.373156,0.714887 -0.745721,0.714887 H 3.7035335 c -0.372574,0 -0.745721,-0.357392 -0.745721,-0.714887 v -3.737544 c 0,-0.357495 0.373155,-0.714885 0.745721,-0.714885 z M 10.11117,18.355089 H 4.7461395 c -0.247686,0 -0.447088,0.192053 -0.447088,0.430613 0,0.238558 0.199402,0.430612 0.447088,0.430612 H 10.11117 c 0.247686,0 0.447086,-0.192054 0.447086,-0.430612 0,-0.23856 -0.1994,-0.430613 -0.447086,-0.430613 z m 0,1.72245 H 4.7461395 c -0.247686,0 -0.447088,0.192054 -0.447088,0.430613 0,0.238559 0.199402,0.430613 0.447088,0.430613 H 10.11117 c 0.247686,0 0.447086,-0.192054 0.447086,-0.430613 0,-0.238559 -0.1994,-0.430613 -0.447086,-0.430613 z"
      color="#000001"
      fill="#ff6600"
-     style="text-indent:0;text-decoration-line:none;text-transform:none;stroke-width:0.728771" />
+     style="text-indent:0;text-decoration-line:none;text-transform:none;stroke-width:0.877546" />
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__loop_anchor_start.svg b/res/skins/LateNight/classic/buttons/btn__loop_anchor_start.svg
index c43541f5c67..65af405b163 100644
--- a/res/skins/LateNight/classic/buttons/btn__loop_anchor_start.svg
+++ b/res/skins/LateNight/classic/buttons/btn__loop_anchor_start.svg
@@ -3,48 +3,91 @@
    width="48"
    height="48"
    version="1.1"
-   id="svg6"
    viewBox="0 0 24 24"
+   id="svg597"
+   sodipodi:docname="btn__loop_anchor_start.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   xmlns:svg="http://www.w3.org/2000/svg">
   <defs
-     id="defs10" />
+     id="defs87" />
+  <sodipodi:namedview
+     id="namedview85"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.333333"
+     inkscape:cx="14.742188"
+     inkscape:cy="24"
+     inkscape:window-width="2560"
+     inkscape:window-height="1275"
+     inkscape:window-x="26"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg597" />
+  <g
+     display="none"
+     opacity=".360743"
+     id="g589">
+    <g
+       fill="none"
+       stroke="#000001"
+       stroke-linejoin="round"
+       stroke-width="1.6"
+       id="g583">
+      <path
+         d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z"
+         color="#000001"
+         id="path579" />
+      <path
+         d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z"
+         color="#000001"
+         id="path581" />
+    </g>
+    <path
+       d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z"
+       fill="#d2d2d1"
+       id="path585" />
+    <path
+       d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z"
+       color="#000001"
+       fill="#d2d2d1"
+       id="path587" />
+  </g>
   <path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#918273;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-     d="M 9.2382812,5.9999996 C 8.5306802,5.9999996 8,6.6155811 8,7.2792965 V 16.720703 C 8,17.384418 8.5306796,18 9.2382812,18 H 13 v 3 l 7,-3.75 -7,-3.75 v 2.990234 H 9.5097656 V 7.5097652 H 11 V 5.9999996 Z"
-     id="path853" />
+     d="m 4.9960925,6 c -0.707601,0 -1.23828,0.615582 -1.23828,1.2793 v 9.44141 c 0,0.663715 0.53068,1.2793 1.23828,1.2793 H 8.757813 v 3 l 6.999998,-3.75 -6.999998,-3.75 v 2.99023 H 5.2675825 V 7.50977 h 1.49023 V 6 Z"
+     fill="#d2d2d1"
+     stroke="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="1.6"
+     id="path591" />
   <path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#d2d2d1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-     d="M 9.2382812,5.9999996 C 8.5306802,5.9999996 8,6.6155811 8,7.2792965 V 16.720703 C 8,17.384418 8.5306796,18 9.2382812,18 H 13.566406 V 16.490234 H 9.5097656 V 7.5097652 H 11 V 5.9999996 Z"
-     id="path880" />
+     d="m 4.9960925,6 c -0.707601,0 -1.23828,0.615582 -1.23828,1.2793 v 9.44141 c 0,0.663715 0.53068,1.2793 1.23828,1.2793 h 4.328121 V 16.49024 H 5.2675725 V 7.50977 h 1.49023 V 6 Z"
+     fill="#d2d2d1"
+     id="path593"
+     style="fill:#d2d2d1;fill-opacity:1" />
   <path
-     id="path905"
-     d="M 13,13.5 V 21 l 7,-3.75 z"
-     style="fill:#d2d2d1;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+     d="M 8.757813,13.5 V 21 l 7,-3.75 z"
+     fill="#d2d2d1"
+     id="path595"
+     style="fill:#d2d2d1;fill-opacity:1" />
   <path
      id="path8889-9"
-     d="m 6.6700189,11.594636 c 0,0 0.004,-1.573482 0,-2.0454543 -0.004,-0.4721731 0.1667019,-1.8758042 2.0281356,-1.888106 1.8494715,-0.012245 2.0547205,1.4159901 2.0560575,2.2028027 8.02e-4,0.4720366 0,1.7308286 0,1.7308286"
+     d="m 13.07189,8.9788779 c 0,0 0.0048,-1.8946936 0,-2.4630165 -0.0048,-0.5685634 0.200733,-2.2587347 2.442162,-2.2735478 2.227025,-0.014744 2.474175,1.7050533 2.475784,2.6524867 9.97e-4,0.5683998 0,2.084164 0,2.084164"
      fill="none"
      stroke="#ff6600"
-     stroke-width="1.09316" />
+     stroke-width="1.31632" />
   <path
      id="rect8885-1"
-     d="m 5.6185102,11.415831 c -0.309411,0 -0.6192972,0.296801 -0.6192972,0.593689 v 3.103906 c 0,0.296887 0.3098937,0.593689 0.6192972,0.593689 h 6.1871808 c 0.309411,0 0.619297,-0.296802 0.619297,-0.593689 V 12.00952 c 0,-0.296888 -0.309894,-0.593689 -0.619297,-0.593689 z m 0.8658487,1.430437 h 4.4554831 c 0.205695,0 0.37129,0.159494 0.37129,0.35761 0,0.198115 -0.165595,0.357609 -0.37129,0.357609 H 6.4843589 c -0.2056947,0 -0.3712902,-0.159494 -0.3712902,-0.357609 0,-0.198116 0.1655955,-0.35761 0.3712902,-0.35761 z m 0,1.430438 h 4.4554831 c 0.205695,0 0.37129,0.159494 0.37129,0.357609 0,0.198116 -0.165595,0.35761 -0.37129,0.35761 H 6.4843589 c -0.2056947,0 -0.3712902,-0.159494 -0.3712902,-0.35761 0,-0.198115 0.1655955,-0.357609 0.3712902,-0.357609 z"
+     d="m 11.805723,8.7635727 c -0.372575,0 -0.745721,0.35739 -0.745721,0.7148852 v 3.7375441 c 0,0.357495 0.373156,0.714887 0.745721,0.714887 h 7.450244 c 0.372574,0 0.745721,-0.357392 0.745721,-0.714887 V 9.4784579 c 0,-0.3574952 -0.373155,-0.7148852 -0.745721,-0.7148852 z m 1.042606,1.7224493 h 5.365032 c 0.247686,0 0.447088,0.192053 0.447088,0.430613 0,0.238558 -0.199402,0.430612 -0.447088,0.430612 h -5.365032 c -0.247686,0 -0.447086,-0.192054 -0.447086,-0.430612 0,-0.23856 0.1994,-0.430613 0.447086,-0.430613 z m 0,1.72245 h 5.365032 c 0.247686,0 0.447088,0.192054 0.447088,0.430613 0,0.238559 -0.199402,0.430613 -0.447088,0.430613 h -5.365032 c -0.247686,0 -0.447086,-0.192054 -0.447086,-0.430613 0,-0.238559 0.1994,-0.430613 0.447086,-0.430613 z"
      color="#000001"
      fill="#ff6600"
-     style="text-indent:0;text-decoration-line:none;text-transform:none;stroke-width:0.728771" />
+     style="text-indent:0;text-decoration-line:none;text-transform:none;stroke-width:0.877546" />
 </svg>
diff --git a/res/skins/LateNight/decks/row_5_transportLoopJump.xml b/res/skins/LateNight/decks/row_5_transportLoopJump.xml
index f4a6c276131..6e823d61038 100644
--- a/res/skins/LateNight/decks/row_5_transportLoopJump.xml
+++ b/res/skins/LateNight/decks/row_5_transportLoopJump.xml
@@ -251,7 +251,7 @@
                     <ObjectName>Spinbox_<Variable name="BtnType"/></ObjectName>
                     <SizePolicy>me,min</SizePolicy>
                     <MinimumSize>46,26</MinimumSize>
-                    <MaximumSize>77,26</MaximumSize>
+                    <MaximumSize>78,26</MaximumSize>
                     <Value><Variable name="Group"/>,beatloop_size</Value>
                     <!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
                     <Connection>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_end.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_end.svg
index 2ca5921d7e9..b464e62aecc 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_end.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_end.svg
@@ -4,64 +4,88 @@
    height="48"
    version="1.1"
    viewBox="0 0 24 24"
-   id="svg440"
+   id="svg597"
+   sodipodi:docname="btn__loop_anchor_end.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs87" />
+  <sodipodi:namedview
+     id="namedview85"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.333333"
+     inkscape:cx="23.976562"
+     inkscape:cy="24"
+     inkscape:window-width="2560"
+     inkscape:window-height="1275"
+     inkscape:window-x="26"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg597" />
   <g
      display="none"
      opacity=".360743"
-     id="g432">
+     id="g589">
     <g
        fill="none"
        stroke="#000001"
        stroke-linejoin="round"
        stroke-width="1.6"
-       id="g426">
+       id="g583">
       <path
          d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z"
          color="#000001"
-         id="path422" />
+         id="path579" />
       <path
          d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z"
          color="#000001"
-         id="path424" />
+         id="path581" />
     </g>
     <path
        d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z"
        fill="#918273"
-       id="path428" />
+       id="path585" />
     <path
        d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z"
        color="#000001"
        fill="#918273"
-       id="path430" />
+       id="path587" />
   </g>
   <path
-     d="m11 3.99995-7 3.75 7 3.75v-2.99023h3.49023v8.98047h-1.49023v1.50977h1.76172c0.707602 0 1.23828-0.615581 1.23828-1.2793v-9.44141c0-0.663716-0.53068-1.2793-1.23828-1.2793h-3.76172z"
+     d="m 17.963408,19.38403 c 0.707601,0 1.23828,-0.615582 1.23828,-1.2793 V 8.6633198 c 0,-0.663715 -0.53068,-1.2793 -1.23828,-1.2793 h -3.761721 v -3 l -6.9999975,3.75 6.9999975,3.7500002 V 8.8937898 h 3.490231 V 17.87426 h -1.49023 v 1.50977 z"
      fill="#918273"
-     stroke="#000"
+     stroke="#000000"
      stroke-linecap="round"
      stroke-linejoin="round"
      stroke-width="1.6"
-     id="path434" />
+     id="path591" />
   <path
-     d="m10.4336 6.99995v1.50977h4.05664v8.98047h-1.49023v1.50977h1.76172c0.707602 0 1.23828-0.615581 1.23828-1.2793v-9.44141c0-0.663716-0.53068-1.2793-1.23828-1.2793z"
+     d="m 17.963408,19.38403 c 0.707601,0 1.23828,-0.615582 1.23828,-1.2793 V 8.6633198 c 0,-0.663715 -0.53068,-1.2793 -1.23828,-1.2793 h -4.328121 v 1.50977 h 4.056641 V 17.87426 h -1.49023 v 1.50977 z"
      fill="#918273"
-     id="path436" />
+     id="path593" />
   <path
-     d="m4 7.74995 7-3.75v7.5z"
+     d="M 14.201687,11.88403 V 4.3840298 l -6.9999995,3.75 z"
      fill="#918273"
-     id="path438" />
+     id="path595" />
   <path
      id="path8889-9"
-     d="m 13.212439,12.667869 c 0,0 0.004,-1.573482 0,-2.045454 -0.004,-0.472173 0.166702,-1.8758034 2.028135,-1.8881054 1.849472,-0.01225 2.054721,1.4159894 2.056058,2.2028024 8.02e-4,0.472036 0,1.730828 0,1.730828"
+     d="m 9.8876105,16.847945 c 0,0 -0.0048,-1.894694 0,-2.463016 0.0048,-0.568564 -0.200733,-2.258735 -2.442162,-2.273548 -2.227025,-0.01474 -2.474175,1.705053 -2.475784,2.652486 -9.97e-4,0.5684 0,2.084164 0,2.084164"
      fill="none"
      stroke="#ff6600"
-     stroke-width="1.09316" />
+     stroke-width="1.31632" />
   <path
      id="rect8885-1"
-     d="m 12.16093,12.489064 c -0.309411,0 -0.619297,0.296801 -0.619297,0.593689 v 3.103906 c 0,0.296887 0.309894,0.593689 0.619297,0.593689 h 6.187181 c 0.309411,0 0.619297,-0.296802 0.619297,-0.593689 v -3.103906 c 0,-0.296888 -0.309894,-0.593689 -0.619297,-0.593689 z m 0.865849,1.430437 h 4.455483 c 0.205695,0 0.37129,0.159494 0.37129,0.35761 0,0.198115 -0.165595,0.357609 -0.37129,0.357609 h -4.455483 c -0.205695,0 -0.37129,-0.159494 -0.37129,-0.357609 0,-0.198116 0.165595,-0.35761 0.37129,-0.35761 z m 0,1.430438 h 4.455483 c 0.205695,0 0.37129,0.159494 0.37129,0.357609 0,0.198116 -0.165595,0.35761 -0.37129,0.35761 h -4.455483 c -0.205695,0 -0.37129,-0.159494 -0.37129,-0.35761 0,-0.198115 0.165595,-0.357609 0.37129,-0.357609 z"
+     d="m 11.153776,16.63264 c 0.372575,0 0.745721,0.35739 0.745721,0.714885 v 3.737544 c 0,0.357495 -0.373156,0.714887 -0.745721,0.714887 H 3.7035335 c -0.372574,0 -0.745721,-0.357392 -0.745721,-0.714887 v -3.737544 c 0,-0.357495 0.373155,-0.714885 0.745721,-0.714885 z M 10.11117,18.355089 H 4.7461395 c -0.247686,0 -0.447088,0.192053 -0.447088,0.430613 0,0.238558 0.199402,0.430612 0.447088,0.430612 H 10.11117 c 0.247686,0 0.447086,-0.192054 0.447086,-0.430612 0,-0.23856 -0.1994,-0.430613 -0.447086,-0.430613 z m 0,1.72245 H 4.7461395 c -0.247686,0 -0.447088,0.192054 -0.447088,0.430613 0,0.238559 0.199402,0.430613 0.447088,0.430613 H 10.11117 c 0.247686,0 0.447086,-0.192054 0.447086,-0.430613 0,-0.238559 -0.1994,-0.430613 -0.447086,-0.430613 z"
      color="#000001"
      fill="#ff6600"
-     style="text-indent:0;text-decoration-line:none;text-transform:none;stroke-width:0.728771" />
+     style="text-indent:0;text-decoration-line:none;text-transform:none;stroke-width:0.877546" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_start.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_start.svg
index e77fd66e141..05b2ce3b952 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_start.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_anchor_start.svg
@@ -5,8 +5,32 @@
    version="1.1"
    viewBox="0 0 24 24"
    id="svg597"
+   sodipodi:docname="btn__loop_anchor_start.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs87" />
+  <sodipodi:namedview
+     id="namedview85"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.333333"
+     inkscape:cx="23.976562"
+     inkscape:cy="24"
+     inkscape:window-width="2560"
+     inkscape:window-height="1275"
+     inkscape:window-x="26"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg597" />
   <g
      display="none"
      opacity=".360743"
@@ -37,31 +61,31 @@
        id="path587" />
   </g>
   <path
-     d="m9.23828 6c-0.707601 0-1.23828 0.615582-1.23828 1.2793v9.44141c0 0.663715 0.53068 1.2793 1.23828 1.2793h3.76172v3l7-3.75-7-3.75v2.99023h-3.49023v-8.98047h1.49023v-1.50977z"
+     d="m 4.9960925,6 c -0.707601,0 -1.23828,0.615582 -1.23828,1.2793 v 9.44141 c 0,0.663715 0.53068,1.2793 1.23828,1.2793 H 8.757813 v 3 l 6.999998,-3.75 -6.999998,-3.75 v 2.99023 H 5.2675825 V 7.50977 h 1.49023 V 6 Z"
      fill="#918273"
-     stroke="#000"
+     stroke="#000000"
      stroke-linecap="round"
      stroke-linejoin="round"
      stroke-width="1.6"
      id="path591" />
   <path
-     d="m9.23828 6c-0.707601 0-1.23828 0.615582-1.23828 1.2793v9.44141c0 0.663715 0.53068 1.2793 1.23828 1.2793h4.32812v-1.50977h-4.05664v-8.98047h1.49023v-1.50977z"
+     d="m 4.9960925,6 c -0.707601,0 -1.23828,0.615582 -1.23828,1.2793 v 9.44141 c 0,0.663715 0.53068,1.2793 1.23828,1.2793 h 4.328121 V 16.49024 H 5.2675725 V 7.50977 h 1.49023 V 6 Z"
      fill="#918273"
      id="path593" />
   <path
-     d="m13 13.5v7.5l7-3.75z"
+     d="M 8.757813,13.5 V 21 l 7,-3.75 z"
      fill="#918273"
      id="path595" />
   <path
      id="path8889-9"
-     d="m 6.770158,11.594636 c 0,0 0.004,-1.573481 0,-2.0454542 -0.004,-0.4721731 0.166702,-1.8758042 2.028135,-1.888106 1.849471,-0.012245 2.05472,1.4159901 2.056057,2.2028022 8.02e-4,0.472037 0,1.730829 0,1.730829"
+     d="m 13.07189,8.9788779 c 0,0 0.0048,-1.8946936 0,-2.4630165 -0.0048,-0.5685634 0.200733,-2.2587347 2.442162,-2.2735478 2.227025,-0.014744 2.474175,1.7050533 2.475784,2.6524867 9.97e-4,0.5683998 0,2.084164 0,2.084164"
      fill="none"
      stroke="#ff6600"
-     stroke-width="1.09316" />
+     stroke-width="1.31632" />
   <path
      id="rect8885-1"
-     d="m 5.718649,11.415831 c -0.309411,0 -0.619297,0.296801 -0.619297,0.593689 v 3.103906 c 0,0.296887 0.309894,0.593689 0.619297,0.593689 h 6.18718 c 0.309411,0 0.619297,-0.296802 0.619297,-0.593689 V 12.00952 c 0,-0.296888 -0.309893,-0.593689 -0.619297,-0.593689 z m 0.865849,1.430437 h 4.455482 c 0.205695,0 0.371291,0.159494 0.371291,0.35761 0,0.198115 -0.165596,0.357609 -0.371291,0.357609 H 6.584498 c -0.205695,0 -0.37129,-0.159494 -0.37129,-0.357609 0,-0.198116 0.165595,-0.35761 0.37129,-0.35761 z m 0,1.430438 h 4.455482 c 0.205695,0 0.371291,0.159494 0.371291,0.357609 0,0.198116 -0.165596,0.35761 -0.371291,0.35761 H 6.584498 c -0.205695,0 -0.37129,-0.159494 -0.37129,-0.35761 0,-0.198115 0.165595,-0.357609 0.37129,-0.357609 z"
+     d="m 11.805723,8.7635727 c -0.372575,0 -0.745721,0.35739 -0.745721,0.7148852 v 3.7375441 c 0,0.357495 0.373156,0.714887 0.745721,0.714887 h 7.450244 c 0.372574,0 0.745721,-0.357392 0.745721,-0.714887 V 9.4784579 c 0,-0.3574952 -0.373155,-0.7148852 -0.745721,-0.7148852 z m 1.042606,1.7224493 h 5.365032 c 0.247686,0 0.447088,0.192053 0.447088,0.430613 0,0.238558 -0.199402,0.430612 -0.447088,0.430612 h -5.365032 c -0.247686,0 -0.447086,-0.192054 -0.447086,-0.430612 0,-0.23856 0.1994,-0.430613 0.447086,-0.430613 z m 0,1.72245 h 5.365032 c 0.247686,0 0.447088,0.192054 0.447088,0.430613 0,0.238559 -0.199402,0.430613 -0.447088,0.430613 h -5.365032 c -0.247686,0 -0.447086,-0.192054 -0.447086,-0.430613 0,-0.238559 0.1994,-0.430613 0.447086,-0.430613 z"
      color="#000001"
      fill="#ff6600"
-     style="text-indent:0;text-decoration-line:none;text-transform:none;stroke-width:0.728771" />
+     style="text-indent:0;text-decoration-line:none;text-transform:none;stroke-width:0.877546" />
 </svg>
diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
index 8f2a5f5a3f4..c613846282a 100644
--- a/src/controllers/controlpickermenu.cpp
+++ b/src/controllers/controlpickermenu.cpp
@@ -591,16 +591,16 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
     QString beatloopRollActivateTitle = tr("Loop Roll Selected Beats");
     QString beatloopRollActivateDescription = tr("Create a rolling beat loop of selected beat size");
     QString beatLoopTitle = tr("Loop %1 Beats");
-    QString reverseBeatLoopTitle = tr("Loop %1 Beats set from its exit point");
+    QString reverseBeatLoopTitle = tr("Loop %1 Beats set from its end point");
     QString beatLoopRollTitle = tr("Loop Roll %1 Beats");
-    QString reverseBeatLoopRollTitle = tr("Loop Roll %1 Beats set from its exit point");
+    QString reverseBeatLoopRollTitle = tr("Loop Roll %1 Beats set from its end point");
     QString beatLoopDescription = tr("Create %1-beat loop");
     QString reverseBeatLoopDescription = tr(
-            "Create %1-beat loop with the current play position as loop exit");
+            "Create %1-beat loop with the current play position as loop end");
     QString beatLoopRollDescription = tr("Create temporary %1-beat loop roll");
     QString reverseBeatLoopRollDescription =
             tr("Create temporary %1-beat loop roll with the current play "
-               "position as loop exit");
+               "position as loop end");
 
     QList<double> beatSizes = LoopingControl::getBeatSizes();
 

From 7c975a82180790cabd7495550d8ce64c90e6e79f Mon Sep 17 00:00:00 2001
From: Antoine C <mixxx@acolombier.dev>
Date: Tue, 14 May 2024 21:10:05 +0100
Subject: [PATCH 5/5] Don't use anchor CO to force reverse loop

---
 src/engine/controls/loopingcontrol.cpp | 100 ++++++++++++-------------
 src/engine/controls/loopingcontrol.h   |  26 ++++---
 src/skin/legacy/tooltips.cpp           |   4 +-
 3 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp
index a59e12833af..c38f3214f6a 100644
--- a/src/engine/controls/loopingcontrol.cpp
+++ b/src/engine/controls/loopingcontrol.cpp
@@ -1264,7 +1264,8 @@ void LoopingControl::trackBeatsUpdated(mixxx::BeatsPointer pBeats) {
     }
 }
 
-void LoopingControl::slotBeatLoopActivate(BeatLoopingControl* pBeatLoopControl) {
+void LoopingControl::slotBeatLoopActivate(
+        BeatLoopingControl* pBeatLoopControl, LoopAnchorPoint forcedAnchor) {
     if (!m_pTrack) {
         return;
     }
@@ -1273,17 +1274,18 @@ void LoopingControl::slotBeatLoopActivate(BeatLoopingControl* pBeatLoopControl)
     // looping. slotBeatLoop will update m_pActiveBeatLoop if applicable. Note,
     // this used to only maintain the current start point if a beatloop was
     // enabled. See Issue #6957.
-    slotBeatLoop(pBeatLoopControl->getSize(), m_bLoopingEnabled, true);
+    slotBeatLoop(pBeatLoopControl->getSize(), m_bLoopingEnabled, true, forcedAnchor);
 }
 
-void LoopingControl::slotBeatLoopActivateRoll(BeatLoopingControl* pBeatLoopControl) {
-     if (!m_pTrack) {
-         return;
-     }
+void LoopingControl::slotBeatLoopActivateRoll(
+        BeatLoopingControl* pBeatLoopControl, LoopAnchorPoint forcedAnchor) {
+    if (!m_pTrack) {
+        return;
+    }
 
     // Disregard existing loops (except beatlooprolls).
     m_pSlipEnabled->set(1);
-    slotBeatLoop(pBeatLoopControl->getSize(), m_bLoopRollActive, true);
+    slotBeatLoop(pBeatLoopControl->getSize(), m_bLoopRollActive, true, forcedAnchor);
     m_bLoopRollActive = true;
     m_activeLoopRolls.push(pBeatLoopControl->getSize());
 }
@@ -1430,7 +1432,10 @@ mixxx::audio::FramePos LoopingControl::findQuantizedBeatloopStart(
     return previousFractionBeatPosition + loopLength;
 }
 
-void LoopingControl::slotBeatLoop(double beats, bool keepSetPoint, bool enable) {
+void LoopingControl::slotBeatLoop(double beats,
+        bool keepSetPoint,
+        bool enable,
+        LoopAnchorPoint forcedAnchor) {
     // If this is a "new" loop, stop tracking saved loop changes
     if (!keepSetPoint) {
         emit loopReset();
@@ -1464,7 +1469,9 @@ void LoopingControl::slotBeatLoop(double beats, bool keepSetPoint, bool enable)
         return;
     }
 
-    const LoopAnchorPoint loopAnchor = static_cast<LoopAnchorPoint>(m_pCOLoopAnchor->get());
+    const LoopAnchorPoint loopAnchor = forcedAnchor == LoopAnchorPoint::None
+            ? static_cast<LoopAnchorPoint>(m_pCOLoopAnchor->get())
+            : forcedAnchor;
     // Calculate the new loop start and end positions
     // give start and end defaults so we can detect problems
     LoopInfo newloopInfo = {mixxx::audio::kInvalidFramePos,
@@ -1476,6 +1483,7 @@ void LoopingControl::slotBeatLoop(double beats, bool keepSetPoint, bool enable)
     // create the loop around X beats from there.
     if (keepSetPoint) {
         switch (loopAnchor) {
+        case LoopAnchorPoint::None:
         case LoopAnchorPoint::Start:
             newloopInfo.startPosition = loopInfo.startPosition.isValid()
                     ? loopInfo.startPosition
@@ -1503,6 +1511,7 @@ void LoopingControl::slotBeatLoop(double beats, bool keepSetPoint, bool enable)
         // loop_in is set to the closest beat if quantize is on and the loop size is >= 1 beat.
         // The closest beat might be ahead of play position and will cause a catching loop.
         switch (loopAnchor) {
+        case LoopAnchorPoint::None:
         case LoopAnchorPoint::Start:
             newloopInfo.startPosition = !quantize
                     ? currentPosition
@@ -1519,6 +1528,7 @@ void LoopingControl::slotBeatLoop(double beats, bool keepSetPoint, bool enable)
     }
 
     switch (loopAnchor) {
+    case LoopAnchorPoint::None:
     case LoopAnchorPoint::Start:
         newloopInfo.endPosition = pBeats->findNBeatsFromPosition(newloopInfo.startPosition, beats);
         break;
@@ -1572,6 +1582,7 @@ void LoopingControl::slotBeatLoop(double beats, bool keepSetPoint, bool enable)
     }
 
     switch (loopAnchor) {
+    case LoopAnchorPoint::None:
     case LoopAnchorPoint::Start:
         // 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.
@@ -1937,8 +1948,7 @@ void LoopMoveControl::slotMoveForward(double v) {
 
 BeatLoopingControl::BeatLoopingControl(const QString& group, double size)
         : m_dBeatLoopSize(size),
-          m_bActive(false),
-          m_pCOLoopAnchor(std::make_unique<ControlProxy>(group, "loop_anchor", this)) {
+          m_bActive(false) {
     // This is the original beatloop control which is now deprecated. Its value
     // is the state of the beatloop control (1 for enabled, 0 for disabled).
     m_pLegacy = std::make_unique<ControlPushButton>(
@@ -1952,10 +1962,13 @@ BeatLoopingControl::BeatLoopingControl(const QString& group, double size)
     // A push-button which activates the beatloop.
     m_pActivate = std::make_unique<ControlPushButton>(
             keyForControl(group, "beatloop_%1_activate", size));
-    connect(m_pActivate.get(),
+    connect(
+            m_pActivate.get(),
             &ControlObject::valueChanged,
             this,
-            &BeatLoopingControl::slotActivate,
+            [this](double value) {
+                slotActivate(value, LoopingControl::LoopAnchorPoint::None);
+            },
             Qt::DirectConnection);
     // And the same but setting it from the end point instead of starting
     m_pRActivate = std::make_unique<ControlPushButton>(
@@ -1968,10 +1981,13 @@ BeatLoopingControl::BeatLoopingControl(const QString& group, double size)
     // A push-button which toggles the beatloop as active or inactive.
     m_pToggle = std::make_unique<ControlPushButton>(
             keyForControl(group, "beatloop_%1_toggle", size));
-    connect(m_pToggle.get(),
+    connect(
+            m_pToggle.get(),
             &ControlObject::valueChanged,
             this,
-            &BeatLoopingControl::slotToggle,
+            [this](double value) {
+                slotToggle(value, LoopingControl::LoopAnchorPoint::None);
+            },
             Qt::DirectConnection);
     // And the same but setting it from the end point instead of starting
     m_pRToggle = std::make_unique<ControlPushButton>(
@@ -1985,10 +2001,13 @@ BeatLoopingControl::BeatLoopingControl(const QString& group, double size)
     // A push-button which activates rolling beatloops
     m_pActivateRoll = std::make_unique<ControlPushButton>(
             keyForControl(group, "beatlooproll_%1_activate", size));
-    connect(m_pActivateRoll.get(),
+    connect(
+            m_pActivateRoll.get(),
             &ControlObject::valueChanged,
             this,
-            &BeatLoopingControl::slotActivateRoll,
+            [this](double value) {
+                slotActivateRoll(value, LoopingControl::LoopAnchorPoint::None);
+            },
             Qt::DirectConnection);
     // And the same but setting it from the end point instead of starting
     m_pRActivateRoll = std::make_unique<ControlPushButton>(
@@ -2024,30 +2043,30 @@ void BeatLoopingControl::activate() {
 void BeatLoopingControl::slotLegacy(double v) {
     //qDebug() << "slotLegacy" << m_dBeatLoopSize << "v" << v;
     if (v > 0) {
-        emit activateBeatLoop(this);
+        emit activateBeatLoop(this, LoopingControl::LoopAnchorPoint::None);
     } else {
         emit deactivateBeatLoop(this);
     }
 }
 
-void BeatLoopingControl::slotActivate(double value) {
+void BeatLoopingControl::slotActivate(double value, LoopingControl::LoopAnchorPoint anchor) {
     //qDebug() << "slotActivate" << m_dBeatLoopSize << "value" << value;
     if (value == 0) {
         return;
     }
-    emit activateBeatLoop(this);
+    emit activateBeatLoop(this, anchor);
 }
 
-void BeatLoopingControl::slotActivateRoll(double v) {
+void BeatLoopingControl::slotActivateRoll(double v, LoopingControl::LoopAnchorPoint anchor) {
     //qDebug() << "slotActivateRoll" << m_dBeatLoopSize << "v" << v;
     if (v > 0) {
-        emit activateBeatLoopRoll(this);
+        emit activateBeatLoopRoll(this, anchor);
     } else {
         emit deactivateBeatLoopRoll(this);
     }
 }
 
-void BeatLoopingControl::slotToggle(double value) {
+void BeatLoopingControl::slotToggle(double value, LoopingControl::LoopAnchorPoint anchor) {
     //qDebug() << "slotToggle" << m_dBeatLoopSize << "value" << value;
     if (value == 0) {
         return;
@@ -2055,45 +2074,18 @@ void BeatLoopingControl::slotToggle(double value) {
     if (m_bActive) {
         emit deactivateBeatLoop(this);
     } else {
-        emit activateBeatLoop(this);
+        emit activateBeatLoop(this, anchor);
     }
 }
 
 void BeatLoopingControl::slotReverseActivate(double value) {
-    bool isReverseAnchor = m_pCOLoopAnchor->toBool();
-    if (!isReverseAnchor) {
-        // If the reverse mode is not enabled, we do so temporarily
-        m_pCOLoopAnchor->set(1.0);
-    }
-    slotActivate(value);
-    if (!isReverseAnchor) {
-        // If the reverse mode was enabled temporarily, we disabled it now
-        m_pCOLoopAnchor->set(0.0);
-    }
+    slotActivate(value, LoopingControl::LoopAnchorPoint::End);
 }
 
 void BeatLoopingControl::slotReverseActivateRoll(double v) {
-    bool isReverseAnchor = m_pCOLoopAnchor->toBool();
-    if (!isReverseAnchor) {
-        // If the reverse mode is not enabled, we do so temporarily
-        m_pCOLoopAnchor->set(1.0);
-    }
-    slotActivateRoll(v);
-    if (!isReverseAnchor) {
-        // If the reverse mode was enabled temporarily, we disabled it now
-        m_pCOLoopAnchor->set(0.0);
-    }
+    slotActivateRoll(v, LoopingControl::LoopAnchorPoint::End);
 }
 
 void BeatLoopingControl::slotReverseToggle(double value) {
-    bool isReverseAnchor = m_pCOLoopAnchor->toBool();
-    if (!isReverseAnchor) {
-        // If the reverse mode is not enabled, we do so temporarily
-        m_pCOLoopAnchor->set(1.0);
-    }
-    slotToggle(value);
-    if (!isReverseAnchor) {
-        // If the reverse mode was enabled temporarily, we disabled it now
-        m_pCOLoopAnchor->set(0.0);
-    }
+    slotToggle(value, LoopingControl::LoopAnchorPoint::End);
 }
diff --git a/src/engine/controls/loopingcontrol.h b/src/engine/controls/loopingcontrol.h
index e5d891c585d..7acf5c7c349 100644
--- a/src/engine/controls/loopingcontrol.h
+++ b/src/engine/controls/loopingcontrol.h
@@ -69,6 +69,7 @@ class LoopingControl : public EngineControl {
                // size will move the end point
         End,   // The loop has been defined by its end point. Adjusting the size
                // will move the end point
+        None,  // Used to indicate the end of the enum type and the null type
     };
 
     struct LoopInfo {
@@ -122,12 +123,20 @@ class LoopingControl : public EngineControl {
 
     // Generate a loop of 'beats' length. It can also do fractions for a
     // beatslicing effect.
-    void slotBeatLoop(double loopSize, bool keepSetPoint = false, bool enable = true);
+    void slotBeatLoop(double loopSize,
+            bool keepSetPoint = false,
+            bool enable = true,
+            LoopingControl::LoopAnchorPoint forcedAnchor =
+                    LoopingControl::LoopAnchorPoint::None);
     void slotBeatLoopSizeChangeRequest(double beats);
     void slotBeatLoopToggle(double pressed);
     void slotBeatLoopRollActivate(double pressed);
-    void slotBeatLoopActivate(BeatLoopingControl* pBeatLoopControl);
-    void slotBeatLoopActivateRoll(BeatLoopingControl* pBeatLoopControl);
+    void slotBeatLoopActivate(BeatLoopingControl* pBeatLoopControl,
+            LoopingControl::LoopAnchorPoint forcedAnchor =
+                    LoopingControl::LoopAnchorPoint::None);
+    void slotBeatLoopActivateRoll(BeatLoopingControl* pBeatLoopControl,
+            LoopingControl::LoopAnchorPoint forcedAnchor =
+                    LoopingControl::LoopAnchorPoint::None);
     void slotBeatLoopDeactivate(BeatLoopingControl* pBeatLoopControl);
     void slotBeatLoopDeactivateRoll(BeatLoopingControl* pBeatLoopControl);
 
@@ -296,18 +305,18 @@ class BeatLoopingControl : public QObject {
     }
   public slots:
     void slotLegacy(double value);
-    void slotActivate(double value);
-    void slotActivateRoll(double value);
-    void slotToggle(double value);
+    void slotActivate(double value, LoopingControl::LoopAnchorPoint forcedAnchor);
+    void slotActivateRoll(double value, LoopingControl::LoopAnchorPoint forcedAnchor);
+    void slotToggle(double value, LoopingControl::LoopAnchorPoint forcedAnchor);
   private slots:
     void slotReverseActivate(double value);
     void slotReverseActivateRoll(double value);
     void slotReverseToggle(double value);
 
   signals:
-    void activateBeatLoop(BeatLoopingControl*);
+    void activateBeatLoop(BeatLoopingControl*, LoopingControl::LoopAnchorPoint forcedAnchor);
     void deactivateBeatLoop(BeatLoopingControl*);
-    void activateBeatLoopRoll(BeatLoopingControl*);
+    void activateBeatLoopRoll(BeatLoopingControl*, LoopingControl::LoopAnchorPoint forcedAnchor);
     void deactivateBeatLoopRoll(BeatLoopingControl*);
 
   private:
@@ -320,6 +329,5 @@ class BeatLoopingControl : public QObject {
     std::unique_ptr<ControlPushButton> m_pRActivateRoll;
     std::unique_ptr<ControlPushButton> m_pToggle;
     std::unique_ptr<ControlPushButton> m_pRToggle;
-    std::unique_ptr<ControlProxy> m_pCOLoopAnchor;
     std::unique_ptr<ControlObject> m_pEnabled;
 };
diff --git a/src/skin/legacy/tooltips.cpp b/src/skin/legacy/tooltips.cpp
index 7acb641bf7d..45a005269f7 100644
--- a/src/skin/legacy/tooltips.cpp
+++ b/src/skin/legacy/tooltips.cpp
@@ -779,8 +779,8 @@ void Tooltips::addStandardTooltips() {
             << tr("Playback will resume where the track would have been if it had not entered the loop.");
 
     add("loop_anchor")
-            << tr("Beatloop")
-            << tr("Define whether the loop is defined and adjusted from its "
+            << tr("Beatloop Anchor")
+            << tr("Define whether the loop is created and adjusted from its "
                   "staring point or ending point.");
 
     add("beatjump_size")