From 33855e9499f8f88071e57c728edf1a593ca6f75d Mon Sep 17 00:00:00 2001 From: Antoine C Date: Fri, 20 Sep 2024 01:28:53 +0100 Subject: [PATCH] fix: sync rate using the current BPM instead of the original one --- .../S4MK3/AdvancedScreen/ViewModels/DeckInfo.qml | 2 +- src/test/controllershareddata_test.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/res/controllers/TraktorKontrolS4MK3Screens/S4MK3/AdvancedScreen/ViewModels/DeckInfo.qml b/res/controllers/TraktorKontrolS4MK3Screens/S4MK3/AdvancedScreen/ViewModels/DeckInfo.qml index 2850a930ff9..6a1f5204f6f 100755 --- 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 index fc483e96878..17c76db1509 100644 --- 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(nullptr); cEngineA = new ControllerScriptEngineLegacy(nullptr, logger); cEngineA->setSharedData(pRuntimeData->namespaced("testNS"));