Browse Source

Fix win32 CI setup; Set audio port group hints and VST3 categories

Signed-off-by: falkTX <falktx@falktx.com>
master
falkTX 3 years ago
parent
commit
7d41abf9ce
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
12 changed files with 83 additions and 23 deletions
  1. +14
    -4
      .github/workflows/build.yml
  2. +1
    -1
      .gitmodules
  3. +1
    -1
      dpf
  4. +34
    -9
      plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.cpp
  5. +8
    -1
      plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.hpp
  6. +2
    -1
      plugins/AmplitudeImposer/DistrhoPluginInfo.h
  7. +8
    -1
      plugins/CycleShifter/DistrhoPluginCycleShifter.cpp
  8. +2
    -1
      plugins/CycleShifter/DistrhoPluginCycleShifter.hpp
  9. +1
    -1
      plugins/CycleShifter/DistrhoPluginInfo.h
  10. +2
    -1
      plugins/SoulForce/DistrhoPluginInfo.h
  11. +8
    -1
      plugins/SoulForce/DistrhoPluginSoulForce.cpp
  12. +2
    -1
      plugins/SoulForce/DistrhoPluginSoulForce.hpp

+ 14
- 4
.github/workflows/build.yml View File

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


+ 1
- 1
.gitmodules View File

@@ -1,3 +1,3 @@
[submodule "dpf"]
path = dpf
url = git://github.com/DISTRHO/DPF
url = https://github.com/DISTRHO/DPF

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit 5d7fd17f6a634ccd648a264743319c145928a27c
Subproject commit 17eecabd4011e087a49a2144164bee1ec3645ade

+ 34
- 9
plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.cpp View File

@@ -1,7 +1,7 @@
/*
* DISTRHO AmplitudeImposer, a DPF'ied AmplitudeImposer.
* Copyright (C) 2004 Niall Moody
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
*
* 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)


+ 8
- 1
plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.hpp View File

@@ -1,7 +1,7 @@
/*
* DISTRHO AmplitudeImposer, a DPF'ied AmplitudeImposer.
* Copyright (C) 2004 Niall Moody
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
*
* 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;
// -------------------------------------------------------------------


+ 2
- 1
plugins/AmplitudeImposer/DistrhoPluginInfo.h View File

@@ -1,7 +1,7 @@
/*
* DISTRHO AmplitudeImposer, a DPF'ied AmplitudeImposer.
* Copyright (C) 2004 Niall Moody
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
*
* 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

+ 8
- 1
plugins/CycleShifter/DistrhoPluginCycleShifter.cpp View File

@@ -1,7 +1,7 @@
/*
* DISTRHO CycleShifter, a DPF'ied CycleShifter.
* Copyright (C) 2004 Niall Moody
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
*
* 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;


+ 2
- 1
plugins/CycleShifter/DistrhoPluginCycleShifter.hpp View File

@@ -1,7 +1,7 @@
/*
* DISTRHO CycleShifter, a DPF'ied CycleShifter.
* Copyright (C) 2004 Niall Moody
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
*
* 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;


+ 1
- 1
plugins/CycleShifter/DistrhoPluginInfo.h View File

@@ -1,7 +1,7 @@
/*
* DISTRHO CycleShifter, a DPF'ied CycleShifter.
* Copyright (C) 2004 Niall Moody
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),


+ 2
- 1
plugins/SoulForce/DistrhoPluginInfo.h View File

@@ -1,7 +1,7 @@
/*
* DISTRHO SoulForce, a DPF'ied SoulForce.
* Copyright (C) 2006 Niall Moody
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
*
* 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

+ 8
- 1
plugins/SoulForce/DistrhoPluginSoulForce.cpp View File

@@ -1,7 +1,7 @@
/*
* DISTRHO SoulForce, a DPF'ied SoulForce.
* Copyright (C) 2006 Niall Moody
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
*
* 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;


+ 2
- 1
plugins/SoulForce/DistrhoPluginSoulForce.hpp View File

@@ -1,7 +1,7 @@
/*
* DISTRHO SoulForce, a DPF'ied SoulForce.
* Copyright (C) 2006 Niall Moody
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
*
* 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;


Loading…
Cancel
Save