fix: sync rate using the current BPM instead of the original one

acolombier · Sep 24, 2024 · 33855e9 · 33855e9
1 parent 2332548
commit 33855e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/res/controllers/TraktorKontrolS4MK3Screens/S4MK3/AdvancedScreen/ViewModels/DeckInfo.qml b/res/controllers/TraktorKontrolS4MK3Screens/S4MK3/AdvancedScreen/ViewModels/DeckInfo.qml
@@ -450,7 +450,7 @@ Item {
             id: propBPM
         }
         Mixxx.ControlProxy {
-            group: viewModel.leaderGroup
+            group: '[InternalClock]'
             key: "bpm"
             id: propMasterBPM
         }

diff --git a/src/test/controllershareddata_test.cpp b/src/test/controllershareddata_test.cpp
@@ -14,13 +14,15 @@
 #include "util/color/colorpalette.h"
 #include "util/time.h"
 
+using namespace std::chrono_literals;
+
 const RuntimeLoggingCategory logger(QString("test").toLocal8Bit());
 
 class ControllerSharedDataTest : public MixxxTest {
   protected:
     void SetUp() override {
         mixxx::Time::setTestMode(true);
-        mixxx::Time::setTestElapsedTime(mixxx::Duration::fromMillis(10));
+        mixxx::Time::addTestTime(10ms);
         pRuntimeData = std::make_shared<ControllerSharedData>(nullptr);
         cEngineA = new ControllerScriptEngineLegacy(nullptr, logger);
         cEngineA->setSharedData(pRuntimeData->namespaced("testNS"));