From 3040de559061a448d549bcc42eb1c860393a7157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Sat, 18 Jan 2025 12:01:30 -0500 Subject: [PATCH] dataflow: fix conversion of int addresses into float nodes ; fix midi mapping of CCs into e.g. ISF shaders --- 3rdparty/libossia | 2 +- .../Widgets/AddressNumericSettingsWidget.hpp | 2 ++ src/plugins/score-plugin-gfx/Gfx/GfxDevice.cpp | 2 +- src/plugins/score-plugin-vst/Vst/Widgets.hpp | 9 ++++++++- src/plugins/score-plugin-vst3/Vst3/Widgets.hpp | 9 ++++++++- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/3rdparty/libossia b/3rdparty/libossia index 52e6f47cc4..7402ffd63f 160000 --- a/3rdparty/libossia +++ b/3rdparty/libossia @@ -1 +1 @@ -Subproject commit 52e6f47cc45fea713e599bcee88d7815321abb9f +Subproject commit 7402ffd63f8771015833e0ff51249f4c5061f8e0 diff --git a/src/plugins/score-plugin-deviceexplorer/Explorer/Common/AddressSettings/Widgets/AddressNumericSettingsWidget.hpp b/src/plugins/score-plugin-deviceexplorer/Explorer/Common/AddressSettings/Widgets/AddressNumericSettingsWidget.hpp index 40b399f80c..696364b255 100644 --- a/src/plugins/score-plugin-deviceexplorer/Explorer/Common/AddressSettings/Widgets/AddressNumericSettingsWidget.hpp +++ b/src/plugins/score-plugin-deviceexplorer/Explorer/Common/AddressSettings/Widgets/AddressNumericSettingsWidget.hpp @@ -10,6 +10,8 @@ #include #include +#include + namespace Explorer { template diff --git a/src/plugins/score-plugin-gfx/Gfx/GfxDevice.cpp b/src/plugins/score-plugin-gfx/Gfx/GfxDevice.cpp index e51e775489..f4d16f1b04 100644 --- a/src/plugins/score-plugin-gfx/Gfx/GfxDevice.cpp +++ b/src/plugins/score-plugin-gfx/Gfx/GfxDevice.cpp @@ -103,7 +103,7 @@ GfxOutputDevice::GfxOutputDevice( m_capas.canRemoveNode = false; m_capas.canRenameNode = false; m_capas.canSetProperties = false; - m_capas.canRefreshTree = true; + m_capas.canRefreshTree = false; m_capas.canRefreshValue = false; m_capas.hasCallbacks = false; m_capas.canListen = false; diff --git a/src/plugins/score-plugin-vst/Vst/Widgets.hpp b/src/plugins/score-plugin-vst/Vst/Widgets.hpp index fd61c9d288..03fcedcd2e 100644 --- a/src/plugins/score-plugin-vst/Vst/Widgets.hpp +++ b/src/plugins/score-plugin-vst/Vst/Widgets.hpp @@ -81,8 +81,15 @@ class GraphicsSlider final override; }; -struct VSTFloatSlider : ossia::safe_nodes::control_in +struct VSTFloatSlider { + const std::string_view name; + + explicit constexpr VSTFloatSlider(const char* name) + : name{name} + { + } + static QWidget* make_widget( AEffect* fx, const ControlInlet& inlet, const score::DocumentContext& ctx, QWidget* parent, QObject* context); diff --git a/src/plugins/score-plugin-vst3/Vst3/Widgets.hpp b/src/plugins/score-plugin-vst3/Vst3/Widgets.hpp index 4b2d200601..9c7ec3878a 100644 --- a/src/plugins/score-plugin-vst3/Vst3/Widgets.hpp +++ b/src/plugins/score-plugin-vst3/Vst3/Widgets.hpp @@ -80,8 +80,15 @@ class VSTGraphicsSlider final override; }; -struct VSTFloatSlider : ossia::safe_nodes::control_in +struct VSTFloatSlider { + const std::string_view name; + + explicit constexpr VSTFloatSlider(const char* name) + : name{name} + { + } + static QWidget* make_widget( Steinberg::Vst::IEditController* fx, const ControlInlet& inlet, const score::DocumentContext& ctx, QWidget* parent, QObject* context);