From 51046a8ca18fb47cae6e66ba3e560da2acfbc893 Mon Sep 17 00:00:00 2001 From: thibaudk Date: Thu, 12 Dec 2024 00:02:40 +0000 Subject: [PATCH] [controller] more on passing devices as argument, only pass c_name for now --- Hardware/3rdparty/bugui | 2 +- Hardware/Controller.cpp | 9 +-------- Hardware/Controller.hpp | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Hardware/3rdparty/bugui b/Hardware/3rdparty/bugui index 7666658..805aa07 160000 --- a/Hardware/3rdparty/bugui +++ b/Hardware/3rdparty/bugui @@ -1 +1 @@ -Subproject commit 766665812f73b11beb05411727008790ba2e0ff1 +Subproject commit 805aa0773c9330ac7c8db669845ae7485cb2ce8d diff --git a/Hardware/Controller.cpp b/Hardware/Controller.cpp index 9a272da..798a02c 100644 --- a/Hardware/Controller.cpp +++ b/Hardware/Controller.cpp @@ -5,18 +5,11 @@ #include "Controller.hpp" -#include - -struct test -{ - using type = Launchpad_Pro_Standalone; -}; - namespace Hardware { Controller::Controller(const score::DocumentContext& document, Scenario::IntervalModel& i) - : bugui::controller{test{}} + : bugui::controller{"Launchpad_Pro_Standalone"} , doc{document} , interval{&i} , h_ofset{0.} // initial horizontal ofset diff --git a/Hardware/Controller.hpp b/Hardware/Controller.hpp index bb9900a..1c3ca0c 100644 --- a/Hardware/Controller.hpp +++ b/Hardware/Controller.hpp @@ -10,7 +10,7 @@ namespace Hardware { -class SCORE_ADDON_HARDWARE_EXPORT Controller +class SCORE_ADDON_HARDWARE_EXPORT Controller final : public bugui::controller , public QObject {