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/.gitmodules b/.gitmodules index 608b657..924d963 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "dpf"] path = dpf - url = git://github.com/DISTRHO/DPF + url = https://github.com/DISTRHO/DPF diff --git a/dpf b/dpf index 5d7fd17..17eecab 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 5d7fd17f6a634ccd648a264743319c145928a27c +Subproject commit 17eecabd4011e087a49a2144164bee1ec3645ade diff --git a/plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.cpp b/plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.cpp index 65ac876..16a4860 100644 --- a/plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.cpp +++ b/plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.cpp @@ -1,7 +1,7 @@ /* * DISTRHO AmplitudeImposer, a DPF'ied AmplitudeImposer. * Copyright (C) 2004 Niall Moody - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015-2022 Filipe Coelho * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -57,20 +57,28 @@ void DistrhoPluginAmplitudeImposer::initAudioPort(bool input, uint32_t index, Au switch (index) { case 0: - port.name = "Input Left (Amp Env)"; - port.symbol = "in_left_amp"; + port.name = "Input Left (Amp Env)"; + port.symbol = "in_left_amp"; + port.groupId = kPortGroupAmpEnv; + // FIXME VST3 sidechain handling + // port.hints = kAudioPortIsSidechain; break; case 1: - port.name = "Input Right (Amp Env)"; - port.symbol = "in_right_amp"; + port.name = "Input Right (Amp Env)"; + port.symbol = "in_right_amp"; + port.groupId = kPortGroupAmpEnv; + // FIXME VST3 sidechain handling + // port.hints = kAudioPortIsSidechain; break; case 2: - port.name = "Input Left (Audio)"; - port.symbol = "in_left_audio"; + port.name = "Input Left (Audio)"; + port.symbol = "in_left_audio"; + port.groupId = kPortGroupAudio; break; case 3: - port.name = "Input Right (Audio)"; - port.symbol = "in_right_audio"; + port.name = "Input Right (Audio)"; + port.symbol = "in_right_audio"; + port.groupId = kPortGroupAudio; break; } } @@ -87,6 +95,8 @@ void DistrhoPluginAmplitudeImposer::initAudioPort(bool input, uint32_t index, Au port.symbol = "out_right"; break; } + + port.groupId = kPortGroupStereo; } } @@ -111,6 +121,21 @@ void DistrhoPluginAmplitudeImposer::initParameter(uint32_t index, Parameter& par } } +void DistrhoPluginAmplitudeImposer::initPortGroup(uint32_t groupId, PortGroup& portGroup) +{ + switch (groupId) + { + case kPortGroupAmpEnv: + portGroup.name = "Amp Env"; + portGroup.symbol = "amp_env"; + break; + case kPortGroupAudio: + portGroup.name = "Audio"; + portGroup.symbol = "audio"; + break; + } +} + void DistrhoPluginAmplitudeImposer::initProgramName(uint32_t index, String& programName) { if (index != 0) diff --git a/plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.hpp b/plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.hpp index 95e6a91..da9c313 100644 --- a/plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.hpp +++ b/plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.hpp @@ -1,7 +1,7 @@ /* * DISTRHO AmplitudeImposer, a DPF'ied AmplitudeImposer. * Copyright (C) 2004 Niall Moody - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015-2022 Filipe Coelho * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -39,6 +39,12 @@ public: kParameterThreshold, kParameterCount }; + + enum PortGroups { + kPortGroupAmpEnv, + kPortGroupAudio, + kPortGroupCount + }; DistrhoPluginAmplitudeImposer(); @@ -92,6 +98,7 @@ Also has a threshold level for the second input, so that when the signal falls b void initAudioPort(bool input, uint32_t index, AudioPort& port) override; void initParameter(uint32_t index, Parameter& parameter) override; + void initPortGroup(uint32_t groupId, PortGroup& portGroup) override; void initProgramName(uint32_t index, String& programName) override; // ------------------------------------------------------------------- diff --git a/plugins/AmplitudeImposer/DistrhoPluginInfo.h b/plugins/AmplitudeImposer/DistrhoPluginInfo.h index b38076b..eadc15a 100644 --- a/plugins/AmplitudeImposer/DistrhoPluginInfo.h +++ b/plugins/AmplitudeImposer/DistrhoPluginInfo.h @@ -1,7 +1,7 @@ /* * DISTRHO AmplitudeImposer, a DPF'ied AmplitudeImposer. * Copyright (C) 2004 Niall Moody - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015-2022 Filipe Coelho * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -36,5 +36,6 @@ #define DISTRHO_PLUGIN_WANT_PROGRAMS 1 #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:AmplifierPlugin" +#define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Dynamics" #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED diff --git a/plugins/CycleShifter/DistrhoPluginCycleShifter.cpp b/plugins/CycleShifter/DistrhoPluginCycleShifter.cpp index 2567ed9..823c51b 100644 --- a/plugins/CycleShifter/DistrhoPluginCycleShifter.cpp +++ b/plugins/CycleShifter/DistrhoPluginCycleShifter.cpp @@ -1,7 +1,7 @@ /* * DISTRHO CycleShifter, a DPF'ied CycleShifter. * Copyright (C) 2004 Niall Moody - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015-2022 Filipe Coelho * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -43,6 +43,13 @@ DistrhoPluginCycleShifter::DistrhoPluginCycleShifter() // ----------------------------------------------------------------------- // Init +void DistrhoPluginCycleShifter::initAudioPort(bool input, uint32_t index, AudioPort& port) +{ + port.groupId = kPortGroupMono; + + Plugin::initAudioPort(input, index, port); +} + void DistrhoPluginCycleShifter::initParameter(uint32_t index, Parameter& parameter) { parameter.hints = kParameterIsAutomatable; diff --git a/plugins/CycleShifter/DistrhoPluginCycleShifter.hpp b/plugins/CycleShifter/DistrhoPluginCycleShifter.hpp index 4d2524d..6b844c4 100644 --- a/plugins/CycleShifter/DistrhoPluginCycleShifter.hpp +++ b/plugins/CycleShifter/DistrhoPluginCycleShifter.hpp @@ -1,7 +1,7 @@ /* * DISTRHO CycleShifter, a DPF'ied CycleShifter. * Copyright (C) 2004 Niall Moody - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015-2022 Filipe Coelho * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -87,6 +87,7 @@ Works best with long/sustained sounds (e.g. strings, pads etc.), sounds like a w // ------------------------------------------------------------------- // Init + void initAudioPort(bool input, uint32_t index, AudioPort& port) override; void initParameter(uint32_t index, Parameter& parameter) override; void initProgramName(uint32_t index, String& programName) override; diff --git a/plugins/CycleShifter/DistrhoPluginInfo.h b/plugins/CycleShifter/DistrhoPluginInfo.h index 3550c07..1a253cb 100644 --- a/plugins/CycleShifter/DistrhoPluginInfo.h +++ b/plugins/CycleShifter/DistrhoPluginInfo.h @@ -1,7 +1,7 @@ /* * DISTRHO CycleShifter, a DPF'ied CycleShifter. * Copyright (C) 2004 Niall Moody - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015-2022 Filipe Coelho * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/plugins/SoulForce/DistrhoPluginInfo.h b/plugins/SoulForce/DistrhoPluginInfo.h index e046d66..3f0419f 100644 --- a/plugins/SoulForce/DistrhoPluginInfo.h +++ b/plugins/SoulForce/DistrhoPluginInfo.h @@ -1,7 +1,7 @@ /* * DISTRHO SoulForce, a DPF'ied SoulForce. * Copyright (C) 2006 Niall Moody - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015-2022 Filipe Coelho * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -36,5 +36,6 @@ #define DISTRHO_PLUGIN_WANT_PROGRAMS 1 #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:WaveshaperPlugin" +#define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Distortion" #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED diff --git a/plugins/SoulForce/DistrhoPluginSoulForce.cpp b/plugins/SoulForce/DistrhoPluginSoulForce.cpp index f6cd0b4..2da762f 100644 --- a/plugins/SoulForce/DistrhoPluginSoulForce.cpp +++ b/plugins/SoulForce/DistrhoPluginSoulForce.cpp @@ -1,7 +1,7 @@ /* * DISTRHO SoulForce, a DPF'ied SoulForce. * Copyright (C) 2006 Niall Moody - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015-2022 Filipe Coelho * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -42,6 +42,13 @@ DistrhoPluginSoulForce::DistrhoPluginSoulForce() // ----------------------------------------------------------------------- // Init +void DistrhoPluginSoulForce::initAudioPort(bool input, uint32_t index, AudioPort& port) +{ + port.groupId = kPortGroupStereo; + + Plugin::initAudioPort(input, index, port); +} + void DistrhoPluginSoulForce::initParameter(uint32_t index, Parameter& parameter) { parameter.hints = kParameterIsAutomatable; diff --git a/plugins/SoulForce/DistrhoPluginSoulForce.hpp b/plugins/SoulForce/DistrhoPluginSoulForce.hpp index c09e599..ea1c18d 100644 --- a/plugins/SoulForce/DistrhoPluginSoulForce.hpp +++ b/plugins/SoulForce/DistrhoPluginSoulForce.hpp @@ -1,7 +1,7 @@ /* * DISTRHO SoulForce, a DPF'ied SoulForce. * Copyright (C) 2006 Niall Moody - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015-2022 Filipe Coelho * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -100,6 +100,7 @@ Can get pretty loud and obnoxious."; // ------------------------------------------------------------------- // Init + void initAudioPort(bool input, uint32_t index, AudioPort& port) override; void initParameter(uint32_t index, Parameter& parameter) override; void initProgramName(uint32_t index, String& programName) override;