From 02b6349a1d763d8b1159a7cda68bd5031dfb3774 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 22 Jul 2022 07:16:14 +0100 Subject: [PATCH] Fix win32 CI setup; Set audio port group hints and vst3 categories Signed-off-by: falkTX --- .github/workflows/build.yml | 18 ++++++++++++++---- dpf | 2 +- plugins/ProM/DistrhoPluginInfo.h | 3 ++- plugins/ProM/DistrhoPluginProM.cpp | 9 ++++++++- plugins/ProM/DistrhoPluginProM.hpp | 3 ++- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ccae50..a7508d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,8 @@ jobs: run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4 - name: Set up dependencies run: | sudo dpkg --add-architecture arm64 @@ -60,7 +61,8 @@ jobs: run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4 - name: Set up dependencies run: | sudo dpkg --add-architecture armhf @@ -98,7 +100,8 @@ jobs: run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4 - name: Set up dependencies run: | sudo dpkg --add-architecture i386 @@ -193,7 +196,8 @@ jobs: run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4 - name: Set up dependencies run: | sudo dpkg --add-architecture i386 @@ -226,6 +230,12 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive + - name: Fix GitHub's mess + run: | + sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list + sudo apt-get update -qq + sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal + sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4 - name: Set up dependencies run: | sudo apt-get update -qq diff --git a/dpf b/dpf index 5d7fd17..ad3c5da 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 5d7fd17f6a634ccd648a264743319c145928a27c +Subproject commit ad3c5dae30b548134635873ee05e021d18da2e5e diff --git a/plugins/ProM/DistrhoPluginInfo.h b/plugins/ProM/DistrhoPluginInfo.h index e1ee977..3024761 100644 --- a/plugins/ProM/DistrhoPluginInfo.h +++ b/plugins/ProM/DistrhoPluginInfo.h @@ -1,6 +1,6 @@ /* * DISTRHO ProM Plugin - * Copyright (C) 2015-2021 Filipe Coelho + * Copyright (C) 2015-2022 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,5 +30,6 @@ #define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 1 #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:AnalyserPlugin" +#define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Analyzer" #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED diff --git a/plugins/ProM/DistrhoPluginProM.cpp b/plugins/ProM/DistrhoPluginProM.cpp index 452e290..be88ee1 100644 --- a/plugins/ProM/DistrhoPluginProM.cpp +++ b/plugins/ProM/DistrhoPluginProM.cpp @@ -1,6 +1,6 @@ /* * DISTRHO ProM Plugin - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015-2022 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,6 +36,13 @@ DistrhoPluginProM::~DistrhoPluginProM() // ----------------------------------------------------------------------- // Init +void DistrhoPluginProM::initAudioPort(bool input, uint32_t index, AudioPort& port) +{ + port.groupId = kPortGroupStereo; + + Plugin::initAudioPort(input, index, port); +} + void DistrhoPluginProM::initParameter(uint32_t, Parameter&) { } diff --git a/plugins/ProM/DistrhoPluginProM.hpp b/plugins/ProM/DistrhoPluginProM.hpp index 4ba16e8..f7aa9d1 100644 --- a/plugins/ProM/DistrhoPluginProM.hpp +++ b/plugins/ProM/DistrhoPluginProM.hpp @@ -1,6 +1,6 @@ /* * DISTRHO ProM Plugin - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015-2022 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -76,6 +76,7 @@ protected: // ------------------------------------------------------------------- // Init + void initAudioPort(bool input, uint32_t index, AudioPort& port) override; void initParameter(uint32_t, Parameter&) override; // -------------------------------------------------------------------