From a5dfb18ae799e8e4ad95735aa8bfff4a19a217bf Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 14 Jul 2024 07:42:49 +0100 Subject: [PATCH 1/3] Update dpf Signed-off-by: falkTX --- dpf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dpf b/dpf index 8f10cdc..7a338bd 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 8f10cdc4f11a256f597fc39a7ac6de38a28cef57 +Subproject commit 7a338bd8b4da6e5a2d0fbc28525b2763b262784b From fab125fe81d5c1243f8504c8f6fb2e46b799708b Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 14 Jul 2024 12:24:12 +0100 Subject: [PATCH 2/3] Update dpf, drop custom macos scroll delta multiplier Signed-off-by: falkTX --- .github/workflows/build.yml | 2 +- dpf | 2 +- src/CardinalUI.cpp | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 30750c4..1517211 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -160,7 +160,7 @@ jobs: strategy: matrix: target: [universal-10.15] - runs-on: macos-11 + runs-on: macos-12 steps: - uses: actions/checkout@v4 with: diff --git a/dpf b/dpf index 7a338bd..470c5b7 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 7a338bd8b4da6e5a2d0fbc28525b2763b262784b +Subproject commit 470c5b7a77091bbea2154cd1d96d3cb1be737aa3 diff --git a/src/CardinalUI.cpp b/src/CardinalUI.cpp index c1c01fd..f5905d1 100644 --- a/src/CardinalUI.cpp +++ b/src/CardinalUI.cpp @@ -1041,10 +1041,7 @@ protected: if (inSelfTest) return false; #endif - rack::math::Vec scrollDelta = rack::math::Vec(-ev.delta.getX(), ev.delta.getY()); - #ifndef DISTRHO_OS_MAC - scrollDelta = scrollDelta.mult(50.0); - #endif + const rack::math::Vec scrollDelta = rack::math::Vec(-ev.delta.getX(), ev.delta.getY()); const int mods = glfwMods(ev.mod); const ScopedContext sc(this, mods); From c36ba1f99ca697dfec026ba557aaf55feb65ec88 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 14 Jul 2024 14:08:32 +0100 Subject: [PATCH 3/3] Fix headless build Signed-off-by: falkTX --- include/plugincontext.hpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/include/plugincontext.hpp b/include/plugincontext.hpp index 661b31d..bda0263 100644 --- a/include/plugincontext.hpp +++ b/include/plugincontext.hpp @@ -20,12 +20,7 @@ struct Message; // Base DISTRHO classes #ifndef DISTRHO_DETAILS_HPP_INCLUDED - namespace CardinalDISTRHO { - -class Plugin; -class UI; - struct MidiEvent { static const uint32_t kDataSize = 4; uint32_t frame; @@ -33,9 +28,19 @@ struct MidiEvent { uint8_t data[kDataSize]; const uint8_t* dataExt; }; +} +#endif +#ifndef DISTRHO_PLUGIN_HPP_INCLUDED +namespace CardinalDISTRHO { +class Plugin; } +#endif +#ifndef DISTRHO_UI_HPP_INCLUDED +namespace CardinalDISTRHO { +class UI; +} #endif // --------------------------------------------------------------------------------------------------------------------