Merge branch 'DISTRHO:main' into CVfunk

.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:

dpf

@@ -1 +1 @@
-Subproject commit 8f10cdc4f11a256f597fc39a7ac6de38a28cef57
+Subproject commit 470c5b7a77091bbea2154cd1d96d3cb1be737aa3

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
 
 // --------------------------------------------------------------------------------------------------------------------

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);