From b8a1adaa55a357d2c3b55f2ce691f63c910ebcea Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 2 Nov 2023 12:32:38 +0100
Subject: [PATCH 1/8] BpmControl: use std::unique_ptr

---
 src/engine/controls/bpmcontrol.cpp | 116 +++++++++++++++--------------
 src/engine/controls/bpmcontrol.h   |  40 +++++-----
 2 files changed, 81 insertions(+), 75 deletions(-)

diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp
index aba923fcb71..e89ef9f1170 100644
--- a/src/engine/controls/bpmcontrol.cpp
+++ b/src/engine/controls/bpmcontrol.cpp
@@ -51,9 +51,9 @@ BpmControl::BpmControl(const QString& group,
     m_dSyncTargetBeatDistance.setValue(0.0);
     m_dUserOffset.setValue(0.0);
 
-    m_pPlayButton = new ControlProxy(group, "play", this);
-    m_pReverseButton = new ControlProxy(group, "reverse", this);
-    m_pRateRatio = new ControlProxy(group, "rate_ratio", this);
+    m_pPlayButton = std::make_unique<ControlProxy>(group, "play", this);
+    m_pReverseButton = std::make_unique<ControlProxy>(group, "reverse", this);
+    m_pRateRatio = std::make_unique<ControlProxy>(group, "rate_ratio", this);
     m_pRateRatio->connectValueChanged(this, &BpmControl::slotUpdateEngineBpm,
                                       Qt::DirectConnection);
 
@@ -62,33 +62,46 @@ BpmControl::BpmControl(const QString& group,
     m_pPrevBeat.reset(new ControlProxy(group, "beat_prev"));
     m_pNextBeat.reset(new ControlProxy(group, "beat_next"));
 
-    m_pLoopEnabled = new ControlProxy(group, "loop_enabled", this);
-    m_pLoopStartPosition = new ControlProxy(group, "loop_start_position", this);
-    m_pLoopEndPosition = new ControlProxy(group, "loop_end_position", this);
+    m_pLoopEnabled = std::make_unique<ControlProxy>(group, "loop_enabled", this);
+    m_pLoopStartPosition = std::make_unique<ControlProxy>(group, "loop_start_position", this);
+    m_pLoopEndPosition = std::make_unique<ControlProxy>(group, "loop_end_position", this);
 
-    m_pLocalBpm = new ControlObject(ConfigKey(group, "local_bpm"));
-    m_pAdjustBeatsFaster = new ControlPushButton(ConfigKey(group, "beats_adjust_faster"), false);
+    m_pLocalBpm = std::make_unique<ControlObject>(ConfigKey(group, "local_bpm"));
+    m_pAdjustBeatsFaster = std::make_unique<ControlPushButton>(
+            ConfigKey(group, "beats_adjust_faster"), false);
     m_pAdjustBeatsFaster->setKbdRepeatable(true);
-    connect(m_pAdjustBeatsFaster, &ControlObject::valueChanged,
-            this, &BpmControl::slotAdjustBeatsFaster,
+    connect(m_pAdjustBeatsFaster.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BpmControl::slotAdjustBeatsFaster,
             Qt::DirectConnection);
-    m_pAdjustBeatsSlower = new ControlPushButton(ConfigKey(group, "beats_adjust_slower"), false);
+    m_pAdjustBeatsSlower = std::make_unique<ControlPushButton>(
+            ConfigKey(group, "beats_adjust_slower"), false);
     m_pAdjustBeatsSlower->setKbdRepeatable(true);
-    connect(m_pAdjustBeatsSlower, &ControlObject::valueChanged,
-            this, &BpmControl::slotAdjustBeatsSlower,
+    connect(m_pAdjustBeatsSlower.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BpmControl::slotAdjustBeatsSlower,
             Qt::DirectConnection);
-    m_pTranslateBeatsEarlier = new ControlPushButton(ConfigKey(group, "beats_translate_earlier"), false);
+    m_pTranslateBeatsEarlier = std::make_unique<ControlPushButton>(
+            ConfigKey(group, "beats_translate_earlier"), false);
     m_pTranslateBeatsEarlier->setKbdRepeatable(true);
-    connect(m_pTranslateBeatsEarlier, &ControlObject::valueChanged,
-            this, &BpmControl::slotTranslateBeatsEarlier,
+    connect(m_pTranslateBeatsEarlier.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BpmControl::slotTranslateBeatsEarlier,
             Qt::DirectConnection);
-    m_pTranslateBeatsLater = new ControlPushButton(ConfigKey(group, "beats_translate_later"), false);
+    m_pTranslateBeatsLater = std::make_unique<ControlPushButton>(
+            ConfigKey(group, "beats_translate_later"), false);
     m_pTranslateBeatsLater->setKbdRepeatable(true);
-    connect(m_pTranslateBeatsLater, &ControlObject::valueChanged,
-            this, &BpmControl::slotTranslateBeatsLater,
+    connect(m_pTranslateBeatsLater.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BpmControl::slotTranslateBeatsLater,
             Qt::DirectConnection);
-    m_pTranslateBeatsMove = new ControlEncoder(ConfigKey(group, "beats_translate_move"), false);
-    connect(m_pTranslateBeatsMove,
+    m_pTranslateBeatsMove = std::make_unique<ControlEncoder>(
+            ConfigKey(group, "beats_translate_move"), false);
+    connect(m_pTranslateBeatsMove.get(),
             &ControlObject::valueChanged,
             this,
             &BpmControl::slotTranslateBeatsMove,
@@ -99,7 +112,7 @@ BpmControl::BpmControl(const QString& group,
     // bpm_down controls.
     // bpm_up / bpm_down steps by kBpmRangeStep
     // bpm_up_small / bpm_down_small steps by kBpmRangeSmallStep
-    m_pEngineBpm = new ControlLinPotmeter(
+    m_pEngineBpm = std::make_unique<ControlLinPotmeter>(
             ConfigKey(group, "bpm"),
             kBpmRangeMin,
             kBpmRangeMax,
@@ -107,27 +120,33 @@ BpmControl::BpmControl(const QString& group,
             kBpmRangeSmallStep,
             true);
     m_pEngineBpm->set(0.0);
-    connect(m_pEngineBpm, &ControlObject::valueChanged,
-            this, &BpmControl::slotUpdateRateSlider,
-            Qt::DirectConnection);
-
-    m_pButtonTap = new ControlPushButton(ConfigKey(group, "bpm_tap"));
-    connect(m_pButtonTap, &ControlObject::valueChanged,
-            this, &BpmControl::slotBpmTap,
+    connect(m_pEngineBpm.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BpmControl::slotUpdateRateSlider,
             Qt::DirectConnection);
 
-    m_pTranslateBeats = new ControlPushButton(ConfigKey(group, "beats_translate_curpos"));
-    connect(m_pTranslateBeats, &ControlObject::valueChanged,
-            this, &BpmControl::slotBeatsTranslate,
+    m_pBpmTap = std::make_unique<ControlPushButton>(ConfigKey(group, "bpm_tap"));
+    connect(m_pBpmTap.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BpmControl::slotBpmTap,
             Qt::DirectConnection);
 
-    m_pBeatsTranslateMatchAlignment = new ControlPushButton(ConfigKey(group, "beats_translate_match_alignment"));
-    connect(m_pBeatsTranslateMatchAlignment, &ControlObject::valueChanged,
-            this, &BpmControl::slotBeatsTranslateMatchAlignment,
+    m_pTranslateBeats = std::make_unique<ControlPushButton>(
+            ConfigKey(group, "beats_translate_curpos"));
+    connect(m_pTranslateBeats.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BpmControl::slotBeatsTranslate,
             Qt::DirectConnection);
 
-    connect(&m_tapFilter, &TapFilter::tapped,
-            this, &BpmControl::slotTapFilter,
+    m_pBeatsTranslateMatchAlignment = std::make_unique<ControlPushButton>(
+            ConfigKey(group, "beats_translate_match_alignment"));
+    connect(m_pBeatsTranslateMatchAlignment.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BpmControl::slotBeatsTranslateMatchAlignment,
             Qt::DirectConnection);
 
     m_pBpmLock = std::make_unique<ControlPushButton>(
@@ -138,30 +157,17 @@ BpmControl::BpmControl(const QString& group,
             &BpmControl::slotToggleBpmLock,
             Qt::DirectConnection);
 
-    m_pBeatsUndo = new ControlPushButton(ConfigKey(group, "beats_undo_adjustment"));
-    connect(m_pBeatsUndo,
+    m_pBeatsUndo = std::make_unique<ControlPushButton>(
+            ConfigKey(group, "beats_undo_adjustment"));
+    connect(m_pBeatsUndo.get(),
             &ControlObject::valueChanged,
             this,
             &BpmControl::slotBeatsUndoAdjustment,
             Qt::DirectConnection);
 
     // Measures distance from last beat in percentage: 0.5 = half-beat away.
-    m_pThisBeatDistance = new ControlProxy(group, "beat_distance", this);
-    m_pSyncMode = new ControlProxy(group, "sync_mode", this);
-}
-
-BpmControl::~BpmControl() {
-    delete m_pLocalBpm;
-    delete m_pEngineBpm;
-    delete m_pButtonTap;
-    delete m_pTranslateBeats;
-    delete m_pBeatsTranslateMatchAlignment;
-    delete m_pTranslateBeatsEarlier;
-    delete m_pTranslateBeatsLater;
-    delete m_pTranslateBeatsMove;
-    delete m_pAdjustBeatsFaster;
-    delete m_pAdjustBeatsSlower;
-    delete m_pBeatsUndo;
+    m_pThisBeatDistance = std::make_unique<ControlProxy>(group, "beat_distance", this);
+    m_pSyncMode = std::make_unique<ControlProxy>(group, "sync_mode", this);
 }
 
 mixxx::Bpm BpmControl::getBpm() const {
diff --git a/src/engine/controls/bpmcontrol.h b/src/engine/controls/bpmcontrol.h
index d5fa7c08a88..3c5fa9271ce 100644
--- a/src/engine/controls/bpmcontrol.h
+++ b/src/engine/controls/bpmcontrol.h
@@ -21,7 +21,6 @@ class BpmControl : public EngineControl {
 
   public:
     BpmControl(const QString& group, UserSettingsPointer pConfig);
-    ~BpmControl() override;
 
     mixxx::Bpm getBpm() const;
     mixxx::Bpm getLocalBpm() const {
@@ -125,10 +124,10 @@ class BpmControl : public EngineControl {
     friend class SyncControl;
 
     // ControlObjects that come from EngineBuffer
-    ControlProxy* m_pPlayButton;
+    std::unique_ptr<ControlProxy> m_pPlayButton;
     QAtomicInt m_oldPlayButton;
-    ControlProxy* m_pReverseButton;
-    ControlProxy* m_pRateRatio;
+    std::unique_ptr<ControlProxy> m_pReverseButton;
+    std::unique_ptr<ControlProxy> m_pRateRatio;
     ControlObject* m_pQuantize;
 
     // ControlObjects that come from QuantizeControl
@@ -136,41 +135,42 @@ class BpmControl : public EngineControl {
     QScopedPointer<ControlProxy> m_pPrevBeat;
 
     // ControlObjects that come from LoopingControl
-    ControlProxy* m_pLoopEnabled;
-    ControlProxy* m_pLoopStartPosition;
-    ControlProxy* m_pLoopEndPosition;
+    std::unique_ptr<ControlProxy> m_pLoopEnabled;
+    std::unique_ptr<ControlProxy> m_pLoopStartPosition;
+    std::unique_ptr<ControlProxy> m_pLoopEndPosition;
 
     // The average bpm around the current playposition;
-    ControlObject* m_pLocalBpm;
-    ControlPushButton* m_pAdjustBeatsFaster;
-    ControlPushButton* m_pAdjustBeatsSlower;
-    ControlPushButton* m_pTranslateBeatsEarlier;
-    ControlPushButton* m_pTranslateBeatsLater;
-    ControlEncoder* m_pTranslateBeatsMove;
-    ControlPushButton* m_pBeatsUndo;
+    std::unique_ptr<ControlObject> m_pLocalBpm;
+    std::unique_ptr<ControlPushButton> m_pAdjustBeatsFaster;
+    std::unique_ptr<ControlPushButton> m_pAdjustBeatsSlower;
+    std::unique_ptr<ControlPushButton> m_pTranslateBeatsEarlier;
+    std::unique_ptr<ControlPushButton> m_pTranslateBeatsLater;
+    std::unique_ptr<ControlEncoder> m_pTranslateBeatsMove;
+    std::unique_ptr<ControlPushButton> m_pBeatsUndo;
 
     std::unique_ptr<ControlPushButton> m_pBpmLock;
 
     // The current effective BPM of the engine
-    ControlLinPotmeter* m_pEngineBpm;
+    std::unique_ptr<ControlLinPotmeter> m_pEngineBpm;
 
     // Used for bpm tapping from GUI and MIDI
-    ControlPushButton* m_pButtonTap;
+    std::unique_ptr<ControlPushButton> m_pBpmTap;  // File BPM
+    std::unique_ptr<ControlPushButton> m_pRateTap; // Enigne BPM (playback rate)
 
     // Button that translates the beats so the nearest beat is on the current
     // playposition.
-    ControlPushButton* m_pTranslateBeats;
+    std::unique_ptr<ControlPushButton> m_pTranslateBeats;
     // Button that translates beats to match another playing deck
-    ControlPushButton* m_pBeatsTranslateMatchAlignment;
+    std::unique_ptr<ControlPushButton> m_pBeatsTranslateMatchAlignment;
 
-    ControlProxy* m_pThisBeatDistance;
+    std::unique_ptr<ControlProxy> m_pThisBeatDistance;
     ControlValueAtomic<double> m_dSyncTargetBeatDistance;
     // The user offset is a beat distance percentage value that the user has tweaked a deck
     // to bring it in sync with the other decks. This value is added to the reported beat
     // distance to get the virtual beat distance used for sync.
     ControlValueAtomic<double> m_dUserOffset;
     QAtomicInt m_resetSyncAdjustment;
-    ControlProxy* m_pSyncMode;
+    std::unique_ptr<ControlProxy> m_pSyncMode;
 
     TapFilter m_tapFilter; // threadsafe
 

From 1f67d57379e9c3a4db1bd5d3003535e080ad2571 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 2 Nov 2023 13:13:28 +0100
Subject: [PATCH 2/8] BpmControl: add 'tempo_tap' control for tapping the
 playback speed

---
 src/engine/controls/bpmcontrol.cpp | 69 ++++++++++++++++++++++++++----
 src/engine/controls/bpmcontrol.h   | 15 ++++---
 2 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp
index e89ef9f1170..5541e2c3747 100644
--- a/src/engine/controls/bpmcontrol.cpp
+++ b/src/engine/controls/bpmcontrol.cpp
@@ -24,7 +24,7 @@ constexpr double kBpmRangeSmallStep = 0.1;
 
 constexpr double kBpmAdjustMin = kBpmRangeMin;
 constexpr double kBpmAdjustStep = 0.01;
-constexpr double kBpmTabRounding = 1 / 12.0;
+constexpr double kBpmTapRounding = 1 / 12.0;
 
 // Maximum allowed interval between beats (calculated from kBpmTapMin).
 constexpr double kBpmTapMin = 30.0;
@@ -40,12 +40,24 @@ constexpr int kLocalBpmSpan = 4;
 // of the next beat.
 constexpr double kPastBeatMatchThreshold = 1 / 8.0;
 
+mixxx::Bpm averageBpmRoundedWithinRange(double averageLength, double rateRatio) {
+    // (60 seconds per minute) * (1000 milliseconds per second) /
+    //   (X millis per beat)
+    // = Y beats/minute
+    auto averageBpm = mixxx::Bpm(60.0 * 1000.0 / averageLength / rateRatio);
+    averageBpm = BeatUtils::roundBpmWithinRange(averageBpm - kBpmTapRounding,
+            averageBpm,
+            averageBpm + kBpmTapRounding);
+    return averageBpm;
+}
+
 } // namespace
 
 BpmControl::BpmControl(const QString& group,
         UserSettingsPointer pConfig)
         : EngineControl(group, pConfig),
-          m_tapFilter(this, kBpmTapFilterLength, kBpmTapMaxInterval),
+          m_bpmTapFilter(this, kBpmTapFilterLength, kBpmTapMaxInterval),
+          m_tempoTapFilter(this, kBpmTapFilterLength, kBpmTapMaxInterval),
           m_dSyncInstantaneousBpm(0.0),
           m_dLastSyncAdjustment(1.0) {
     m_dSyncTargetBeatDistance.setValue(0.0);
@@ -126,12 +138,31 @@ BpmControl::BpmControl(const QString& group,
             &BpmControl::slotUpdateRateSlider,
             Qt::DirectConnection);
 
+    // Tap the (file) BPM
     m_pBpmTap = std::make_unique<ControlPushButton>(ConfigKey(group, "bpm_tap"));
     connect(m_pBpmTap.get(),
             &ControlObject::valueChanged,
             this,
             &BpmControl::slotBpmTap,
             Qt::DirectConnection);
+    connect(&m_bpmTapFilter,
+            &TapFilter::tapped,
+            this,
+            &BpmControl::slotBpmTapFilter,
+            Qt::DirectConnection);
+
+    // Tap the tempo (playback speed)
+    m_pTempoTap = std::make_unique<ControlPushButton>(ConfigKey(group, "tempo_tap"));
+    connect(m_pTempoTap.get(),
+            &ControlObject::valueChanged,
+            this,
+            &BpmControl::slotTempoTap,
+            Qt::DirectConnection);
+    connect(&m_tempoTapFilter,
+            &TapFilter::tapped,
+            this,
+            &BpmControl::slotTempoTapFilter,
+            Qt::DirectConnection);
 
     m_pTranslateBeats = std::make_unique<ControlPushButton>(
             ConfigKey(group, "beats_translate_curpos"));
@@ -259,11 +290,11 @@ void BpmControl::slotBeatsUndoAdjustment(double v) {
 
 void BpmControl::slotBpmTap(double v) {
     if (v > 0) {
-        m_tapFilter.tap();
+        m_bpmTapFilter.tap();
     }
 }
 
-void BpmControl::slotTapFilter(double averageLength, int numSamples) {
+void BpmControl::slotBpmTapFilter(double averageLength, int numSamples) {
     // averageLength is the average interval in milliseconds tapped over
     // numSamples samples.  Have to convert to BPM now:
 
@@ -286,16 +317,38 @@ void BpmControl::slotTapFilter(double averageLength, int numSamples) {
 
     // (60 seconds per minute) * (1000 milliseconds per second) / (X millis per
     // beat) = Y beats/minute
-    auto averageBpm = mixxx::Bpm(60.0 * 1000.0 / averageLength / rateRatio);
-    averageBpm = BeatUtils::roundBpmWithinRange(averageBpm - kBpmTabRounding,
-            averageBpm,
-            averageBpm + kBpmTabRounding);
+    auto averageBpm = averageBpmRoundedWithinRange(averageLength, rateRatio);
     const auto newBeats = pBeats->trySetBpm(averageBpm);
     if (!newBeats) {
         return;
     }
     pTrack->trySetBeats(*newBeats);
 }
+void BpmControl::slotTempoTap(double v) {
+    if (v > 0) {
+        m_tempoTapFilter.tap();
+    }
+}
+
+void BpmControl::slotTempoTapFilter(double averageLength, int numSamples) {
+    // averageLength is the average interval in milliseconds tapped over
+    // numSamples samples. Have to convert to BPM now:
+    if (averageLength <= 0 || numSamples < 4) {
+        return;
+    }
+
+    const TrackPointer pTrack = getEngineBuffer()->getLoadedTrack();
+    if (!pTrack) {
+        return;
+    }
+
+    auto averageBpm = averageBpmRoundedWithinRange(averageLength, 1.0);
+    m_pEngineBpm->set(averageBpm.value());
+    // NOTE(ronso0) When setting the control, m_pEngineBpm->valueChanged()
+    // is not emitted (with Qt6) (it is when setting via a ControlProxy),
+    // so call the slot directly.
+    slotUpdateRateSlider(averageBpm.value());
+}
 
 // static
 double BpmControl::shortestPercentageChange(const double& current_percentage,
diff --git a/src/engine/controls/bpmcontrol.h b/src/engine/controls/bpmcontrol.h
index 3c5fa9271ce..f3f3f00fd15 100644
--- a/src/engine/controls/bpmcontrol.h
+++ b/src/engine/controls/bpmcontrol.h
@@ -102,8 +102,12 @@ class BpmControl : public EngineControl {
     void slotTranslateBeatsEarlier(double);
     void slotTranslateBeatsLater(double);
     void slotTranslateBeatsMove(double);
-    void slotTapFilter(double,int);
-    void slotBpmTap(double);
+
+    void slotBpmTap(double value);
+    void slotBpmTapFilter(double averageLength, int numSamples);
+    void slotTempoTap(double value);
+    void slotTempoTapFilter(double averageLength, int numSamples);
+
     void slotUpdateRateSlider(double v = 0.0);
     void slotUpdateEngineBpm(double v = 0.0);
     void slotBeatsTranslate(double);
@@ -154,8 +158,8 @@ class BpmControl : public EngineControl {
     std::unique_ptr<ControlLinPotmeter> m_pEngineBpm;
 
     // Used for bpm tapping from GUI and MIDI
-    std::unique_ptr<ControlPushButton> m_pBpmTap;  // File BPM
-    std::unique_ptr<ControlPushButton> m_pRateTap; // Enigne BPM (playback rate)
+    std::unique_ptr<ControlPushButton> m_pBpmTap;   // File BPM
+    std::unique_ptr<ControlPushButton> m_pTempoTap; // Enigne BPM (playback rate)
 
     // Button that translates the beats so the nearest beat is on the current
     // playposition.
@@ -172,7 +176,8 @@ class BpmControl : public EngineControl {
     QAtomicInt m_resetSyncAdjustment;
     std::unique_ptr<ControlProxy> m_pSyncMode;
 
-    TapFilter m_tapFilter; // threadsafe
+    TapFilter m_bpmTapFilter;   // threadsafe
+    TapFilter m_tempoTapFilter; // threadsafe
 
     // used in the engine thread only
     double m_dSyncInstantaneousBpm;

From af85602903820a34206288da02d9deebd003670a Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 2 Nov 2023 13:50:31 +0100
Subject: [PATCH 3/8] add 'tempo_tap' tooltip, as well as some useful
 combinations

---
 src/skin/legacy/tooltips.cpp | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/skin/legacy/tooltips.cpp b/src/skin/legacy/tooltips.cpp
index fceeca1883e..6720f2b1097 100644
--- a/src/skin/legacy/tooltips.cpp
+++ b/src/skin/legacy/tooltips.cpp
@@ -397,6 +397,11 @@ void Tooltips::addStandardTooltips() {
             << eqKillLatch;
 
     QString tempoDisplay = tr("Displays the tempo of the loaded track in BPM (beats per minute).");
+    // TODO Clarify this refers to 'file BPM', not playback rate?
+    QString bpmTapButton = tr("When tapped repeatedly, adjusts the BPM to match the tapped BPM.");
+    QString tempoTapButton =
+            tr("When tapped repeatedly, adjusts the tempo to match the tapped "
+               "BPM.");
     add("visual_bpm")
             << tr("Tempo")
             << tempoDisplay;
@@ -408,7 +413,14 @@ void Tooltips::addStandardTooltips() {
 
     add("bpm_tap")
             << tr("BPM Tap")
-            << tr("When tapped repeatedly, adjusts the BPM to match the tapped BPM.");
+            << bpmTapButton;
+    add("tempo_tap")
+            << tr("Tempo Tap")
+            << tempoTapButton;
+    add("tempo_tap_bpm_tap")
+            << tr("Rate Tap and BPM Tap")
+            << QString("%1: %2").arg(leftClick, tempoTapButton)
+            << QString("%1: %2").arg(rightClick, bpmTapButton);
 
     add("beats_adjust_slower")
             << tr("Adjust BPM Down")
@@ -439,11 +451,22 @@ void Tooltips::addStandardTooltips() {
             << tr("Revert last BPM/Beatgrid Change")
             << tr("Revert last BPM/Beatgrid Change of the loaded track.");
 
-    //this is a special case, in some skins we might display a transparent png for bpm_tap on top of visual_bpm
+    // These are special cases:
+    // in some skins we display a transparent button for tempo_tap and/or bpm_tap
+    // on top of the visual_bpm display.
     add("bpm_tap_visual_bpm")
             << tr("Tempo and BPM Tap")
             << tempoDisplay
-            << tr("When tapped repeatedly, adjusts the BPM to match the tapped BPM.");
+            << bpmTapButton;
+    add("tempo_tap_visual_bpm")
+            << tr("Tempo and Rate Tap")
+            << tempoDisplay
+            << tempoTapButton;
+    add("tempo_tap_bpm_tap_visual_bpm")
+            << tr("Tempo, Rate Tap and BPM Tap")
+            << tempoDisplay
+            << QString("%1: %2").arg(leftClick, tempoTapButton)
+            << QString("%1: %2").arg(rightClick, bpmTapButton);
 
     add("shift_cues_earlier")
             << tr("Shift cues earlier")

From fcd407da60ea63a540ff9cba6f2bcae7bd139dd4 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 2 Nov 2023 13:56:35 +0100
Subject: [PATCH 4/8] Skins: use new tempo_tap button (right-click is bpm_tap),
 adjust tooltips

---
 res/skins/Deere/deck_text_row.xml                |  8 +++++---
 res/skins/LateNight/decks/rate_controls.xml      |  9 ++++++---
 .../LateNight/decks/rate_controls_compact.xml    | 16 +++++++++-------
 res/skins/Shade/sampler.xml                      | 15 ++++++---------
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/res/skins/Deere/deck_text_row.xml b/res/skins/Deere/deck_text_row.xml
index cac79290177..d8809788a3b 100644
--- a/res/skins/Deere/deck_text_row.xml
+++ b/res/skins/Deere/deck_text_row.xml
@@ -258,7 +258,7 @@
                               </Template>
 
                               <PushButton>
-                                <TooltipId>bpm_tap</TooltipId>
+                                <TooltipId>tempo_tap_bpm_tap</TooltipId>
                                 <MinimumSize>30,20</MinimumSize>
                                 <MaximumSize>60,30</MaximumSize>
                                 <SizePolicy>me,me</SizePolicy>
@@ -267,10 +267,12 @@
                                   <Number>0</Number>
                                   <Text>TAP</Text>
                                 </State>
+                                <Connection>
+                                  <ConfigKey><Variable name="group"/>,tempo_tap</ConfigKey>
+                                </Connection>
                                 <Connection>
                                   <ConfigKey><Variable name="group"/>,bpm_tap</ConfigKey>
-                                  <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-                                  <ButtonState>LeftButton</ButtonState>
+                                  <ButtonState>RightButton</ButtonState>
                                 </Connection>
                               </PushButton>
                             </Children>
diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml
index d74e0550f8a..8736cf01feb 100644
--- a/res/skins/LateNight/decks/rate_controls.xml
+++ b/res/skins/LateNight/decks/rate_controls.xml
@@ -31,15 +31,18 @@
                 <Layout>stacked</Layout>
                 <Size>57f,-1me</Size>
                 <Children>
-                  <!-- In order to make the bpm display tappable, we use an old-style
-                  widget group and put the bpm pushbutton on top of the display. -->
+                  <!-- invisible Tempo/BPM tap button on top of BPM display -->
                   <PushButton>
-                    <TooltipId>bpm_tap_visual_bpm</TooltipId>
+                    <TooltipId>tempo_tap_bpm_tap_visual_bpm</TooltipId>
                     <ObjectName>BpmTap</ObjectName>
                     <Size>57f,-1me</Size>
                     <NumberStates>1</NumberStates>
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,tempo_tap</ConfigKey>
+                    </Connection>
                     <Connection>
                       <ConfigKey><Variable name="Group"/>,bpm_tap</ConfigKey>
+                      <ButtonState>RightButton</ButtonState>
                     </Connection>
                   </PushButton>
                   <WidgetGroup><!-- BPM + rate -->
diff --git a/res/skins/LateNight/decks/rate_controls_compact.xml b/res/skins/LateNight/decks/rate_controls_compact.xml
index 24ee0960ed5..77a92533863 100644
--- a/res/skins/LateNight/decks/rate_controls_compact.xml
+++ b/res/skins/LateNight/decks/rate_controls_compact.xml
@@ -25,17 +25,19 @@
             <Layout>stacked</Layout>
             <Size>60f,40f</Size>
             <Children>
-              <!-- In order to make the bpm display tappable, we use an old-style
-              widget group and put the bpm pushbutton on top of the display. -->
+              <!-- invisible Tempo/BPM tap button on top of BPM display -->
               <PushButton>
-                <TooltipId>bpm_tap_visual_bpm</TooltipId>
+                <TooltipId>tempo_tap_bpm_tap_visual_bpm</TooltipId>
                 <ObjectName>BpmTap</ObjectName>
                 <SizePolicy>me,me</SizePolicy>
                 <NumberStates>1</NumberStates>
-                <Connection>
-                  <ConfigKey><Variable name="Group"/>,bpm_tap</ConfigKey>
-                  <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-                </Connection>
+                  <Connection>
+                    <ConfigKey><Variable name="Group"/>,tempo_tap</ConfigKey>
+                  </Connection>
+                  <Connection>
+                    <ConfigKey><Variable name="Group"/>,bpm_tap</ConfigKey>
+                    <ButtonState>RightButton</ButtonState>
+                  </Connection>
               </PushButton>
               <WidgetGroup><!-- BPM + rate -->
                 <ObjectName>AlignCenter</ObjectName>
diff --git a/res/skins/Shade/sampler.xml b/res/skins/Shade/sampler.xml
index 251dcb16489..ec147651d11 100644
--- a/res/skins/Shade/sampler.xml
+++ b/res/skins/Shade/sampler.xml
@@ -58,6 +58,7 @@
               <WidgetGroup>
                 <Size>35f,24f</Size>
                 <Children>
+                  <!-- invisible Tempo/BPM tap button on top of BPM display -->
                   <Number>
                     <TooltipId>visual_bpm</TooltipId>
                     <Style>QLabel {
@@ -77,15 +78,8 @@
                       <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
                     </Connection>
                   </Number>
-                  <!-- Little trickery here:
-                    BPM tap is transparent png directly over BPM display, so it became BPM and TAP at once,
-                    changed tooltip accordingly
-                  -->
                   <PushButton>
-                  <!-- Original:
-                    <TooltipId>bpm_tap</TooltipId>
-                  -->
-                    <TooltipId>bpm_tap_visual_bpm</TooltipId>
+                    <TooltipId>tempo_tap_bpm_tap_visual_bpm</TooltipId>
                     <Pos>0,5</Pos>
                     <NumberStates>1</NumberStates>
                     <State>
@@ -93,9 +87,12 @@
                       <Pressed>skin:/btn/btn_tap_sampler_over.png</Pressed>
                       <Unpressed>skin:/btn/btn_tap_sampler.png</Unpressed>
                     </State>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,tempo_tap</ConfigKey>
+                    </Connection>
                     <Connection>
                       <ConfigKey><Variable name="group"/>,bpm_tap</ConfigKey>
-                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                      <ButtonState>RightButton</ButtonState>
                     </Connection>
                   </PushButton>
                 </Children>

From 1f4d8fb3e709ff34b675c9c60cf1d6c45b3a906c Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 3 Nov 2023 15:16:51 +0100
Subject: [PATCH 5/8] add 'tempo_tap' to control picker menu

---
 src/controllers/controlpickermenu.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
index e805f5f567b..041a4ad4e34 100644
--- a/src/controllers/controlpickermenu.cpp
+++ b/src/controllers/controlpickermenu.cpp
@@ -243,6 +243,7 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
     addDeckAndSamplerControl("bpm_up_small", tr("BPM +0.1"), tr("Increase BPM by 0.1"), pBpmMenu);
     addDeckAndSamplerControl("bpm_down_small", tr("BPM -0.1"), tr("Decrease BPM by 0.1"), pBpmMenu);
     addDeckAndSamplerControl("bpm_tap", tr("BPM Tap"), tr("BPM tap button"), pBpmMenu);
+    addDeckAndSamplerControl("tempo_tap", tr("Tempo Tap"), tr("Tempo tap button"), pBpmMenu);
     pBpmMenu->addSeparator();
     addDeckAndSamplerControl("beats_adjust_faster",
             tr("Adjust Beatgrid Faster +.01"),

From 242c5530968416e97e3d240e5eccd9ce7374feb7 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 2 Dec 2023 23:17:28 +0100
Subject: [PATCH 6/8] BpmControl: use PollingControlProxy, remove unused
 members

---
 src/engine/controls/bpmcontrol.cpp | 73 ++++++++++++++----------------
 src/engine/controls/bpmcontrol.h   | 23 +++++-----
 2 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp
index 5541e2c3747..3dba2b0cd5b 100644
--- a/src/engine/controls/bpmcontrol.cpp
+++ b/src/engine/controls/bpmcontrol.cpp
@@ -56,6 +56,16 @@ mixxx::Bpm averageBpmRoundedWithinRange(double averageLength, double rateRatio)
 BpmControl::BpmControl(const QString& group,
         UserSettingsPointer pConfig)
         : EngineControl(group, pConfig),
+          m_pReverseButton(group, QStringLiteral("reverse")),
+          m_pQuantize(group, QStringLiteral("quantize")),
+          m_pNextBeat(group, QStringLiteral("beat_next")),
+          m_pPrevBeat(group, QStringLiteral("beat_prev")),
+          m_pLoopEnabled(group, QStringLiteral("loop_enabled")),
+          m_pLoopStartPosition(group, QStringLiteral("loop_start_position")),
+          m_pLoopEndPosition(group, QStringLiteral("loop_end_position")),
+          // Measures distance from last beat in percentage: 0.5 = half-beat away.
+          m_pThisBeatDistance(group, QStringLiteral("beat_distance")),
+          m_pSyncMode(group, QStringLiteral("sync_mode")),
           m_bpmTapFilter(this, kBpmTapFilterLength, kBpmTapMaxInterval),
           m_tempoTapFilter(this, kBpmTapFilterLength, kBpmTapMaxInterval),
           m_dSyncInstantaneousBpm(0.0),
@@ -63,21 +73,10 @@ BpmControl::BpmControl(const QString& group,
     m_dSyncTargetBeatDistance.setValue(0.0);
     m_dUserOffset.setValue(0.0);
 
-    m_pPlayButton = std::make_unique<ControlProxy>(group, "play", this);
-    m_pReverseButton = std::make_unique<ControlProxy>(group, "reverse", this);
     m_pRateRatio = std::make_unique<ControlProxy>(group, "rate_ratio", this);
     m_pRateRatio->connectValueChanged(this, &BpmControl::slotUpdateEngineBpm,
                                       Qt::DirectConnection);
 
-    m_pQuantize = ControlObject::getControl(group, "quantize");
-
-    m_pPrevBeat.reset(new ControlProxy(group, "beat_prev"));
-    m_pNextBeat.reset(new ControlProxy(group, "beat_next"));
-
-    m_pLoopEnabled = std::make_unique<ControlProxy>(group, "loop_enabled", this);
-    m_pLoopStartPosition = std::make_unique<ControlProxy>(group, "loop_start_position", this);
-    m_pLoopEndPosition = std::make_unique<ControlProxy>(group, "loop_end_position", this);
-
     m_pLocalBpm = std::make_unique<ControlObject>(ConfigKey(group, "local_bpm"));
     m_pAdjustBeatsFaster = std::make_unique<ControlPushButton>(
             ConfigKey(group, "beats_adjust_faster"), false);
@@ -195,10 +194,6 @@ BpmControl::BpmControl(const QString& group,
             this,
             &BpmControl::slotBeatsUndoAdjustment,
             Qt::DirectConnection);
-
-    // Measures distance from last beat in percentage: 0.5 = half-beat away.
-    m_pThisBeatDistance = std::make_unique<ControlProxy>(group, "beat_distance", this);
-    m_pSyncMode = std::make_unique<ControlProxy>(group, "sync_mode", this);
 }
 
 mixxx::Bpm BpmControl::getBpm() const {
@@ -398,17 +393,17 @@ double BpmControl::calcSyncedRate(double userTweak) {
 
     // If we are not quantized, or there are no beats, or we're leader,
     // or we're in reverse, just return the rate as-is.
-    if (!m_pQuantize->toBool() || !m_pBeats || m_pReverseButton->toBool()) {
+    if (!m_pQuantize.toBool() || !m_pBeats || m_pReverseButton.toBool()) {
         m_resetSyncAdjustment = true;
         return rate + userTweak;
     }
 
     const auto prevBeatPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pPrevBeat->get());
+                    m_pPrevBeat.get());
     const auto nextBeatPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pNextBeat->get());
+                    m_pNextBeat.get());
 
     if (!prevBeatPosition.isValid() || !nextBeatPosition.isValid()) {
         m_resetSyncAdjustment = true;
@@ -419,13 +414,13 @@ double BpmControl::calcSyncedRate(double userTweak) {
 
     // Now that we have our beat distance we can also check how large the
     // current loop is.  If we are in a <1 beat loop, don't worry about offset.
-    if (m_pLoopEnabled->toBool()) {
+    if (m_pLoopEnabled.toBool()) {
         const auto loopStartPosition =
                 mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                        m_pLoopStartPosition->get());
+                        m_pLoopStartPosition.get());
         const auto loopEndPosition =
                 mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                        m_pLoopEndPosition->get());
+                        m_pLoopEndPosition.get());
         // This should always be true when a loop is enabled, but we check it
         // anyway to prevent race conditions.
         if (loopStartPosition.isValid() && loopEndPosition.isValid()) {
@@ -464,7 +459,7 @@ double BpmControl::calcSyncAdjustment(bool userTweakingSync) {
     // boundaries too.
 
     const double syncTargetBeatDistance = m_dSyncTargetBeatDistance.getValue();
-    const double thisBeatDistance = m_pThisBeatDistance->get();
+    const double thisBeatDistance = m_pThisBeatDistance.get();
     const double error = shortestPercentageChange(syncTargetBeatDistance, thisBeatDistance);
     const double curUserOffset = m_dUserOffset.getValue();
 
@@ -534,10 +529,10 @@ double BpmControl::getBeatDistance(mixxx::audio::FramePos thisPosition) const {
     }
     mixxx::audio::FramePos prevBeatPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pPrevBeat->get());
+                    m_pPrevBeat.get());
     mixxx::audio::FramePos nextBeatPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pNextBeat->get());
+                    m_pNextBeat.get());
 
     if (!prevBeatPosition.isValid() || !nextBeatPosition.isValid()) {
         return 0.0 - m_dUserOffset.getValue();
@@ -639,10 +634,10 @@ mixxx::audio::FramePos BpmControl::getNearestPositionInPhase(
     // Get the current position of this deck.
     mixxx::audio::FramePos thisPrevBeatPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pPrevBeat->get());
+                    m_pPrevBeat.get());
     mixxx::audio::FramePos thisNextBeatPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pNextBeat->get());
+                    m_pNextBeat.get());
     mixxx::audio::FrameDiff_t thisBeatLengthFrames;
     if (!thisPrevBeatPosition.isValid() || !thisNextBeatPosition.isValid() ||
             thisPosition > thisNextBeatPosition ||
@@ -749,13 +744,13 @@ mixxx::audio::FramePos BpmControl::getNearestPositionInPhase(
     }
 
     // We might be seeking outside the loop.
-    const bool loopEnabled = m_pLoopEnabled->toBool();
+    const bool loopEnabled = m_pLoopEnabled.toBool();
     const auto loopStartPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pLoopStartPosition->get());
+                    m_pLoopStartPosition.get());
     const auto loopEndPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pLoopEndPosition->get());
+                    m_pLoopEndPosition.get());
 
     // Cases for sanity:
     //
@@ -834,10 +829,10 @@ mixxx::audio::FramePos BpmControl::getBeatMatchPosition(
     // Get the current position of this deck.
     mixxx::audio::FramePos thisPrevBeatPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pPrevBeat->get());
+                    m_pPrevBeat.get());
     mixxx::audio::FramePos thisNextBeatPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pNextBeat->get());
+                    m_pNextBeat.get());
     mixxx::audio::FrameDiff_t thisBeatLengthFrames;
 
     // Look up the next beat and beat length for the new position
@@ -957,13 +952,13 @@ mixxx::audio::FramePos BpmControl::getBeatMatchPosition(
     }
 
     // We might be seeking outside the loop.
-    const bool loopEnabled = m_pLoopEnabled->toBool();
+    const bool loopEnabled = m_pLoopEnabled.toBool();
     const auto loopStartPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pLoopStartPosition->get());
+                    m_pLoopStartPosition.get());
     const auto loopEndPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pLoopEndPosition->get());
+                    m_pLoopEndPosition.get());
 
     // Cases for sanity:
     //
@@ -1156,7 +1151,7 @@ double BpmControl::updateBeatDistance() {
 
 double BpmControl::updateBeatDistance(mixxx::audio::FramePos playpos) {
     double beatDistance = getBeatDistance(playpos);
-    m_pThisBeatDistance->set(beatDistance);
+    m_pThisBeatDistance.set(beatDistance);
     if (!isSynchronized() && m_dUserOffset.getValue() != 0.0) {
         m_dUserOffset.setValue(0.0);
     }
@@ -1179,11 +1174,11 @@ void BpmControl::updateInstantaneousBpm(double instantaneousBpm) {
 
 void BpmControl::resetSyncAdjustment() {
     // Immediately edit the beat distance to reflect the new reality.
-    double new_distance = m_pThisBeatDistance->get() + m_dUserOffset.getValue();
+    double new_distance = m_pThisBeatDistance.get() + m_dUserOffset.getValue();
     if (kLogger.traceEnabled()) {
         kLogger.trace() << getGroup() << "BpmControl::resetSyncAdjustment: " << new_distance;
     }
-    m_pThisBeatDistance->set(new_distance);
+    m_pThisBeatDistance.set(new_distance);
     m_dUserOffset.setValue(0.0);
     m_resetSyncAdjustment = true;
 }
@@ -1198,10 +1193,10 @@ void BpmControl::collectFeatures(GroupFeatureState* pGroupFeatures) const {
     // Get the current position of this deck.
     mixxx::audio::FramePos prevBeatPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pPrevBeat->get());
+                    m_pPrevBeat.get());
     mixxx::audio::FramePos nextBeatPosition =
             mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    m_pNextBeat->get());
+                    m_pNextBeat.get());
     mixxx::audio::FrameDiff_t beatLengthFrames;
     double beatFraction;
     if (getBeatContextNoLookup(info.currentPosition,
diff --git a/src/engine/controls/bpmcontrol.h b/src/engine/controls/bpmcontrol.h
index f3f3f00fd15..67817ed27ca 100644
--- a/src/engine/controls/bpmcontrol.h
+++ b/src/engine/controls/bpmcontrol.h
@@ -4,6 +4,7 @@
 
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
+#include "control/pollingcontrolproxy.h"
 #include "engine/controls/enginecontrol.h"
 #include "engine/sync/syncable.h"
 #include "track/beats.h"
@@ -117,7 +118,7 @@ class BpmControl : public EngineControl {
 
   private:
     SyncMode getSyncMode() const {
-        return syncModeFromDouble(m_pSyncMode->get());
+        return syncModeFromDouble(m_pSyncMode.get());
     }
     inline bool isSynchronized() const {
         return toSynchronized(getSyncMode());
@@ -128,20 +129,18 @@ class BpmControl : public EngineControl {
     friend class SyncControl;
 
     // ControlObjects that come from EngineBuffer
-    std::unique_ptr<ControlProxy> m_pPlayButton;
-    QAtomicInt m_oldPlayButton;
-    std::unique_ptr<ControlProxy> m_pReverseButton;
+    PollingControlProxy m_pReverseButton;
     std::unique_ptr<ControlProxy> m_pRateRatio;
-    ControlObject* m_pQuantize;
+    PollingControlProxy m_pQuantize;
 
     // ControlObjects that come from QuantizeControl
-    QScopedPointer<ControlProxy> m_pNextBeat;
-    QScopedPointer<ControlProxy> m_pPrevBeat;
+    PollingControlProxy m_pNextBeat;
+    PollingControlProxy m_pPrevBeat;
 
     // ControlObjects that come from LoopingControl
-    std::unique_ptr<ControlProxy> m_pLoopEnabled;
-    std::unique_ptr<ControlProxy> m_pLoopStartPosition;
-    std::unique_ptr<ControlProxy> m_pLoopEndPosition;
+    PollingControlProxy m_pLoopEnabled;
+    PollingControlProxy m_pLoopStartPosition;
+    PollingControlProxy m_pLoopEndPosition;
 
     // The average bpm around the current playposition;
     std::unique_ptr<ControlObject> m_pLocalBpm;
@@ -167,14 +166,14 @@ class BpmControl : public EngineControl {
     // Button that translates beats to match another playing deck
     std::unique_ptr<ControlPushButton> m_pBeatsTranslateMatchAlignment;
 
-    std::unique_ptr<ControlProxy> m_pThisBeatDistance;
+    PollingControlProxy m_pThisBeatDistance;
     ControlValueAtomic<double> m_dSyncTargetBeatDistance;
     // The user offset is a beat distance percentage value that the user has tweaked a deck
     // to bring it in sync with the other decks. This value is added to the reported beat
     // distance to get the virtual beat distance used for sync.
     ControlValueAtomic<double> m_dUserOffset;
     QAtomicInt m_resetSyncAdjustment;
-    std::unique_ptr<ControlProxy> m_pSyncMode;
+    PollingControlProxy m_pSyncMode;
 
     TapFilter m_bpmTapFilter;   // threadsafe
     TapFilter m_tempoTapFilter; // threadsafe

From 47c9cb5a182e5a06edf86cfc56f3c1d195ab912b Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 2 Dec 2023 23:39:46 +0100
Subject: [PATCH 7/8] BpmControl: simplify slotUpdateEngineBpm()

---
 src/engine/controls/bpmcontrol.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp
index 3dba2b0cd5b..68933d3c337 100644
--- a/src/engine/controls/bpmcontrol.cpp
+++ b/src/engine/controls/bpmcontrol.cpp
@@ -1007,15 +1007,14 @@ mixxx::audio::FrameDiff_t BpmControl::getPhaseOffset(mixxx::audio::FramePos this
 
 void BpmControl::slotUpdateEngineBpm(double value) {
     // Adjust playback bpm in response to a rate_ratio update
-    double dRate = m_pRateRatio->get();
 
     if (kLogger.traceEnabled()) {
         kLogger.trace() << getGroup() << "BpmControl::slotUpdateEngineBpm"
-                        << value << m_pLocalBpm->get() << dRate << frameInfo().currentPosition;
+                        << m_pLocalBpm->get() << value;
         // This can be used to detect pitch shift issues with cloned decks
-        // DEBUG_ASSERT(getGroup() != "[Channel1]" || dRate == 1);
+        // DEBUG_ASSERT(getGroup() != "[Channel1]" || m_pRateRatio->get(); == 1);
     }
-    m_pEngineBpm->set(m_pLocalBpm->get() * dRate);
+    m_pEngineBpm->set(m_pLocalBpm->get() * value);
 }
 
 void BpmControl::slotUpdateRateSlider(double value) {
@@ -1140,7 +1139,7 @@ mixxx::Bpm BpmControl::updateLocalBpm() {
             localBpmValue = localBpm.value();
         }
         m_pLocalBpm->set(localBpmValue);
-        slotUpdateEngineBpm();
+        slotUpdateEngineBpm(m_pRateRatio->get());
     }
     return localBpm;
 }

From 26819061d6b879bc416401f00bb45b84f531d648 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 18 May 2024 23:00:27 +0200
Subject: [PATCH 8/8] BpmControl: rename var, tweak logging, add blank line

---
 src/engine/controls/bpmcontrol.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp
index 68933d3c337..b9360bfadac 100644
--- a/src/engine/controls/bpmcontrol.cpp
+++ b/src/engine/controls/bpmcontrol.cpp
@@ -319,6 +319,7 @@ void BpmControl::slotBpmTapFilter(double averageLength, int numSamples) {
     }
     pTrack->trySetBeats(*newBeats);
 }
+
 void BpmControl::slotTempoTap(double v) {
     if (v > 0) {
         m_tempoTapFilter.tap();
@@ -1005,16 +1006,17 @@ mixxx::audio::FrameDiff_t BpmControl::getPhaseOffset(mixxx::audio::FramePos this
     return position - thisPosition;
 }
 
-void BpmControl::slotUpdateEngineBpm(double value) {
+void BpmControl::slotUpdateEngineBpm(double rateRatio) {
     // Adjust playback bpm in response to a rate_ratio update
-
     if (kLogger.traceEnabled()) {
-        kLogger.trace() << getGroup() << "BpmControl::slotUpdateEngineBpm"
-                        << m_pLocalBpm->get() << value;
+        kLogger.trace() << getGroup() << "BpmControl::slotUpdateEngineBpm: local BPM:"
+                        << m_pLocalBpm->get()
+                        << "rate ratio:"
+                        << rateRatio;
         // This can be used to detect pitch shift issues with cloned decks
         // DEBUG_ASSERT(getGroup() != "[Channel1]" || m_pRateRatio->get(); == 1);
     }
-    m_pEngineBpm->set(m_pLocalBpm->get() * value);
+    m_pEngineBpm->set(m_pLocalBpm->get() * rateRatio);
 }
 
 void BpmControl::slotUpdateRateSlider(double value) {