Fix for LoopIn/LoopOut visualisation in waveforms

src/engine/controls/loopingcontrol.h

@@ -78,6 +78,12 @@ class LoopingControl : public EngineControl {
     bool isLoopingEnabled() {
         return m_bLoopingEnabled;
     }
+    bool isAdjustLoopInActive() {
+        return m_bAdjustingLoopIn;
+    }
+    bool isAdjustLoopOutActive() {
+        return m_bAdjustingLoopOut;
+    }
     bool isLoopRollActive() {
         return m_bLoopRollActive;
     }

src/engine/enginebuffer.cpp

@@ -583,6 +583,8 @@ void EngineBuffer::ejectTrack() {
             0.0,
             SlipModeState::Disabled,
             false,
+            false,
+            false,
             0.0,
             0.0,
             0.0,
@@ -1438,6 +1440,8 @@ void EngineBuffer::updateIndicators(double speed, int iBufferSize) {
             effectiveSlipRate,
             m_slipModeState,
             m_pLoopingControl->isLoopingEnabled(),
+            m_pLoopingControl->isAdjustLoopInActive(),
+            m_pLoopingControl->isAdjustLoopOutActive(),
             fFractionalLoopStartPos,
             fFractionalLoopEndPos,
             tempoTrackSeconds,

src/waveform/visualplayposition.cpp

@@ -29,6 +29,8 @@ void VisualPlayPosition::set(
         double slipRate,
         SlipModeState m_slipModeState,
         bool loopEnabled,
+        bool loopInAdjustActive,
+        bool loopOutAdjustActive,
         double loopStartPosition,
         double loopEndPosition,
         double tempoTrackSeconds,
@@ -43,6 +45,8 @@ void VisualPlayPosition::set(
     data.m_slipPos = slipPosition;
     data.m_slipModeState = m_slipModeState;
     data.m_loopEnabled = loopEnabled;
+    data.m_loopInAdjustActive = loopInAdjustActive;
+    data.m_loopOutAdjustActive = loopOutAdjustActive;
     data.m_loopStartPos = loopStartPosition;
     data.m_loopEndPos = loopEndPosition;
     data.m_tempoTrackSeconds = tempoTrackSeconds;
@@ -104,25 +108,29 @@ double VisualPlayPosition::determinePlayPosInLoopBoundries(
         if (loopSize > 0) {
             if ((data.m_playRate < 0.0) &&
                     (interpolatedPlayPos < data.m_loopStartPos) &&
-                    (data.m_playPos >= data.m_loopStartPos)) {
+                    (data.m_playPos >= data.m_loopStartPos) &&
+                    !data.m_loopInAdjustActive) {
                 // 1. Deck playing reverse
                 // 2. Interpolated playposition at the time of next VSync would
                 // be outsite of the active loop
                 // 3. Playposition is currently inside the active loop
                 //    (not scratching left of an activated loop)
+                // 4. LoopIn is not being held down
                 interpolatedPlayPos = data.m_loopEndPos -
                         std::remainder(
                                 data.m_loopStartPos - interpolatedPlayPos,
                                 loopSize);
             }
             if ((data.m_playRate > 0.0) &&
                     (interpolatedPlayPos > data.m_loopEndPos) &&
-                    (data.m_playPos <= data.m_loopEndPos)) {
+                    (data.m_playPos <= data.m_loopEndPos) &&
+                    !data.m_loopOutAdjustActive) {
                 // 1. Deck playing forward
                 // 2. Interpolated playposition at the time of next VSync would
                 // be outsite of the active loop
                 // 3. Playposition is currently inside the active loop
                 //    (not scratching right of an activated loop)
+                // 4. LoopOut is not being held down
                 interpolatedPlayPos = data.m_loopStartPos +
                         std::remainder(
                                 interpolatedPlayPos - data.m_loopEndPos,

src/waveform/visualplayposition.h

@@ -40,6 +40,8 @@ class VisualPlayPositionData {
     double m_slipRate;
     SlipModeState m_slipModeState;
     bool m_loopEnabled;
+    bool m_loopInAdjustActive;
+    bool m_loopOutAdjustActive;
     double m_loopStartPos;
     double m_loopEndPos;
     double m_tempoTrackSeconds; // total track time, taking the current tempo into account
@@ -62,6 +64,8 @@ class VisualPlayPosition : public QObject {
             double slipRate,
             SlipModeState slipModeState,
             bool loopEnabled,
+            bool loopInAdjustActive,
+            bool loopOutAdjustActive,
             double loopStartPos,
             double loopEndPos,
             double tempoTrackSeconds,