Fixup CI

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Dec 14, 2024 · b433ccc · b433ccc
1 parent c1ef624
commit b433ccc
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,10 +13,9 @@ jobs:
     strategy:
       matrix:
         os:
-          # wrong use of AU MIDIPacket
-          # - macos-12
-          # - macos-13
-          # - macos-14
+          - macos-13
+          - macos-14
+          - macos-15
           # webgui failure
           # - ubuntu-20.04
           - ubuntu-22.04

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -42,49 +42,49 @@ jobs:
           suffix: _24_04
           target: ${{ matrix.target }}
 
-  macos-12:
+  macos-13:
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: distrho/dpf-cmake-action@v1
         with:
           dpf_path: .
-          suffix: _12
+          suffix: _13
           target: ${{ matrix.target }}
 
-  macos-13:
+  macos-14:
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: distrho/dpf-cmake-action@v1
         with:
           dpf_path: .
-          suffix: _13
+          suffix: _14
           target: ${{ matrix.target }}
 
-  macos-14:
+  macos-15:
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: distrho/dpf-cmake-action@v1
         with:
           dpf_path: .
-          suffix: _14
+          suffix: _15
           target: ${{ matrix.target }}
 
   cmake_win32:

diff --git a/.github/workflows/example-plugins.yml b/.github/workflows/example-plugins.yml
@@ -39,47 +39,47 @@ jobs:
           suffix: _24_04
           target: ${{ matrix.target }}
 
-  macos-12:
+  macos-13:
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: distrho/dpf-makefile-action@v1
         with:
           dpf_path: .
-          suffix: _12
+          suffix: _13
           target: ${{ matrix.target }}
 
-  macos-13:
+  macos-14:
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: distrho/dpf-makefile-action@v1
         with:
           dpf_path: .
-          suffix: _13
+          suffix: _14
           target: ${{ matrix.target }}
 
-  macos-14:
+  macos-15:
     strategy:
       matrix:
         target: [macos-intel, macos-universal, macos-10.15]
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: distrho/dpf-makefile-action@v1
         with:
           dpf_path: .
-          suffix: _14
+          suffix: _15
           target: ${{ matrix.target }}
diff --git a/distrho/src/DistrhoPluginAU.cpp b/distrho/src/DistrhoPluginAU.cpp
@@ -202,7 +202,8 @@ static constexpr const uint32_t kType = d_cconst(STRINGIFY(DISTRHO_PLUGIN_AU_TYP
 static constexpr const uint32_t kSubType = d_cconst(STRINGIFY(DISTRHO_PLUGIN_UNIQUE_ID));
 static constexpr const uint32_t kManufacturer = d_cconst(STRINGIFY(DISTRHO_PLUGIN_BRAND_ID));
 
-static constexpr const uint32_t kWantedAudioFormat = kAudioFormatFlagsNativeFloatPacked
+static constexpr const uint32_t kWantedAudioFormat = 0
+                                                   | kAudioFormatFlagsNativeFloatPacked
                                                    | kAudioFormatFlagIsNonInterleaved;
 
 
@@ -278,8 +279,18 @@ typedef std::vector<RenderListener> RenderListeners;
 
 #if DISTRHO_PLUGIN_WANT_MIDI_OUTPUT
 // useful definitions
-static constexpr const uint32_t kMIDIPacketNonDataSize = sizeof(MIDIPacket) - sizeof(MIDIPacket::data);
-static constexpr const uint32_t kMIDIPacketListNonDataSize = sizeof(MIDIPacketList) - sizeof(MIDIPacketList::packet);
+static constexpr const uint32_t kMIDIPacketNonDataSize = sizeof(MIDIPacket)
+                                                      #if __cplusplus >= 201103L
+                                                       - sizeof(MIDIPacket::data);
+                                                      #else
+                                                       - sizeof(static_cast<MIDIPacket*>(0)->data);
+                                                      #endif
+static constexpr const uint32_t kMIDIPacketListNonDataSize = sizeof(MIDIPacketList)
+                                                          #if __cplusplus >= 201103L
+                                                           - sizeof(MIDIPacketList::packet);
+                                                          #else
+                                                           - sizeof(static_cast<MIDIPacketList*>(0)->packet);
+                                                          #endif
 
 // size of data used for midi events
 static constexpr const uint32_t kMIDIPacketListMaxDataSize = kMIDIPacketNonDataSize * kMaxMidiEvents

diff --git a/distrho/src/DistrhoUIInternal.hpp b/distrho/src/DistrhoUIInternal.hpp
@@ -267,12 +267,12 @@ class UIExporter
         uiData->app.repaintIfNeeeded();
     }
 
-    void addIdleCallbackForNativeIdle(IdleCallback* const cb, const uint timerFrequencyInMs)
+    void addIdleCallbackForNativeIdle(DGL_NAMESPACE::IdleCallback* const cb, const uint timerFrequencyInMs)
     {
         uiData->window->addIdleCallback(cb, timerFrequencyInMs);
     }
 
-    void removeIdleCallbackForNativeIdle(IdleCallback* const cb)
+    void removeIdleCallbackForNativeIdle(DGL_NAMESPACE::IdleCallback* const cb)
     {
         uiData->window->removeIdleCallback(cb);
     }

diff --git a/distrho/src/DistrhoUIVST3.cpp b/distrho/src/DistrhoUIVST3.cpp
@@ -129,7 +129,7 @@ static uint translateVST3Modifiers(const int64_t modifiers) noexcept
  * Helper class for getting a native idle timer.
  */
 #if !DPF_VST3_USING_HOST_RUN_LOOP
-class NativeIdleCallback : public IdleCallback
+class NativeIdleCallback : public DGL_NAMESPACE::IdleCallback
 {
 public:
     NativeIdleCallback(UIExporter& ui)