Skip to content

Commit 7d41abf

Browse files
falkTXfalkTX
committed
Fix win32 CI setup; Set audio port group hints and VST3 categories
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 201dca3 commit 7d41abf

12 files changed

Lines changed: 83 additions & 23 deletions

‎.github/workflows/build.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ jobs:
2222
run: |
2323
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
2424
sudo apt-get update -qq
25-
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
25+
sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
26+
sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
2627
- name: Set up dependencies
2728
run: |
2829
sudo dpkg --add-architecture arm64
@@ -60,7 +61,8 @@ jobs:
6061
run: |
6162
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
6263
sudo apt-get update -qq
63-
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
64+
sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
65+
sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
6466
- name: Set up dependencies
6567
run: |
6668
sudo dpkg --add-architecture armhf
@@ -98,7 +100,8 @@ jobs:
98100
run: |
99101
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
100102
sudo apt-get update -qq
101-
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
103+
sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
104+
sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
102105
- name: Set up dependencies
103106
run: |
104107
sudo dpkg --add-architecture i386
@@ -193,7 +196,8 @@ jobs:
193196
run: |
194197
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
195198
sudo apt-get update -qq
196-
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
199+
sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
200+
sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
197201
- name: Set up dependencies
198202
run: |
199203
sudo dpkg --add-architecture i386
@@ -226,6 +230,12 @@ jobs:
226230
- uses: actions/checkout@v2
227231
with:
228232
submodules: recursive
233+
- name: Fix GitHub's mess
234+
run: |
235+
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
236+
sudo apt-get update -qq
237+
sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
238+
sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
229239
- name: Set up dependencies
230240
run: |
231241
sudo apt-get update -qq

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "dpf"]
22
path = dpf
3-
url = git://github.com/DISTRHO/DPF
3+
url = https://github.com/DISTRHO/DPF

‎dpf‎

Submodule dpf updated 133 files

‎plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.cpp‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DISTRHO AmplitudeImposer, a DPF'ied AmplitudeImposer.
33
* Copyright (C) 2004 Niall Moody
4-
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
4+
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a
77
* copy of this software and associated documentation files (the "Software"),
@@ -57,20 +57,28 @@ void DistrhoPluginAmplitudeImposer::initAudioPort(bool input, uint32_t index, Au
5757
switch (index)
5858
{
5959
case 0:
60-
port.name = "Input Left (Amp Env)";
61-
port.symbol = "in_left_amp";
60+
port.name = "Input Left (Amp Env)";
61+
port.symbol = "in_left_amp";
62+
port.groupId = kPortGroupAmpEnv;
63+
// FIXME VST3 sidechain handling
64+
// port.hints = kAudioPortIsSidechain;
6265
break;
6366
case 1:
64-
port.name = "Input Right (Amp Env)";
65-
port.symbol = "in_right_amp";
67+
port.name = "Input Right (Amp Env)";
68+
port.symbol = "in_right_amp";
69+
port.groupId = kPortGroupAmpEnv;
70+
// FIXME VST3 sidechain handling
71+
// port.hints = kAudioPortIsSidechain;
6672
break;
6773
case 2:
68-
port.name = "Input Left (Audio)";
69-
port.symbol = "in_left_audio";
74+
port.name = "Input Left (Audio)";
75+
port.symbol = "in_left_audio";
76+
port.groupId = kPortGroupAudio;
7077
break;
7178
case 3:
72-
port.name = "Input Right (Audio)";
73-
port.symbol = "in_right_audio";
79+
port.name = "Input Right (Audio)";
80+
port.symbol = "in_right_audio";
81+
port.groupId = kPortGroupAudio;
7482
break;
7583
}
7684
}
@@ -87,6 +95,8 @@ void DistrhoPluginAmplitudeImposer::initAudioPort(bool input, uint32_t index, Au
8795
port.symbol = "out_right";
8896
break;
8997
}
98+
99+
port.groupId = kPortGroupStereo;
90100
}
91101
}
92102

@@ -111,6 +121,21 @@ void DistrhoPluginAmplitudeImposer::initParameter(uint32_t index, Parameter& par
111121
}
112122
}
113123

124+
void DistrhoPluginAmplitudeImposer::initPortGroup(uint32_t groupId, PortGroup& portGroup)
125+
{
126+
switch (groupId)
127+
{
128+
case kPortGroupAmpEnv:
129+
portGroup.name = "Amp Env";
130+
portGroup.symbol = "amp_env";
131+
break;
132+
case kPortGroupAudio:
133+
portGroup.name = "Audio";
134+
portGroup.symbol = "audio";
135+
break;
136+
}
137+
}
138+
114139
void DistrhoPluginAmplitudeImposer::initProgramName(uint32_t index, String& programName)
115140
{
116141
if (index != 0)

‎plugins/AmplitudeImposer/DistrhoPluginAmplitudeImposer.hpp‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DISTRHO AmplitudeImposer, a DPF'ied AmplitudeImposer.
33
* Copyright (C) 2004 Niall Moody
4-
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
4+
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a
77
* copy of this software and associated documentation files (the "Software"),
@@ -39,6 +39,12 @@ class DistrhoPluginAmplitudeImposer : public Plugin
3939
kParameterThreshold,
4040
kParameterCount
4141
};
42+
43+
enum PortGroups {
44+
kPortGroupAmpEnv,
45+
kPortGroupAudio,
46+
kPortGroupCount
47+
};
4248

4349
DistrhoPluginAmplitudeImposer();
4450

@@ -92,6 +98,7 @@ Also has a threshold level for the second input, so that when the signal falls b
9298

9399
void initAudioPort(bool input, uint32_t index, AudioPort& port) override;
94100
void initParameter(uint32_t index, Parameter& parameter) override;
101+
void initPortGroup(uint32_t groupId, PortGroup& portGroup) override;
95102
void initProgramName(uint32_t index, String& programName) override;
96103

97104
// -------------------------------------------------------------------

‎plugins/AmplitudeImposer/DistrhoPluginInfo.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DISTRHO AmplitudeImposer, a DPF'ied AmplitudeImposer.
33
* Copyright (C) 2004 Niall Moody
4-
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
4+
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a
77
* copy of this software and associated documentation files (the "Software"),
@@ -36,5 +36,6 @@
3636
#define DISTRHO_PLUGIN_WANT_PROGRAMS 1
3737

3838
#define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:AmplifierPlugin"
39+
#define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Dynamics"
3940

4041
#endif // DISTRHO_PLUGIN_INFO_H_INCLUDED

‎plugins/CycleShifter/DistrhoPluginCycleShifter.cpp‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DISTRHO CycleShifter, a DPF'ied CycleShifter.
33
* Copyright (C) 2004 Niall Moody
4-
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
4+
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a
77
* copy of this software and associated documentation files (the "Software"),
@@ -43,6 +43,13 @@ DistrhoPluginCycleShifter::DistrhoPluginCycleShifter()
4343
// -----------------------------------------------------------------------
4444
// Init
4545

46+
void DistrhoPluginCycleShifter::initAudioPort(bool input, uint32_t index, AudioPort& port)
47+
{
48+
port.groupId = kPortGroupMono;
49+
50+
Plugin::initAudioPort(input, index, port);
51+
}
52+
4653
void DistrhoPluginCycleShifter::initParameter(uint32_t index, Parameter& parameter)
4754
{
4855
parameter.hints = kParameterIsAutomatable;

‎plugins/CycleShifter/DistrhoPluginCycleShifter.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DISTRHO CycleShifter, a DPF'ied CycleShifter.
33
* Copyright (C) 2004 Niall Moody
4-
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
4+
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a
77
* 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
8787
// -------------------------------------------------------------------
8888
// Init
8989

90+
void initAudioPort(bool input, uint32_t index, AudioPort& port) override;
9091
void initParameter(uint32_t index, Parameter& parameter) override;
9192
void initProgramName(uint32_t index, String& programName) override;
9293

‎plugins/CycleShifter/DistrhoPluginInfo.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DISTRHO CycleShifter, a DPF'ied CycleShifter.
33
* Copyright (C) 2004 Niall Moody
4-
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
4+
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a
77
* copy of this software and associated documentation files (the "Software"),

‎plugins/SoulForce/DistrhoPluginInfo.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DISTRHO SoulForce, a DPF'ied SoulForce.
33
* Copyright (C) 2006 Niall Moody
4-
* Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
4+
* Copyright (C) 2015-2022 Filipe Coelho <falktx@falktx.com>
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a
77
* copy of this software and associated documentation files (the "Software"),
@@ -36,5 +36,6 @@
3636
#define DISTRHO_PLUGIN_WANT_PROGRAMS 1
3737

3838
#define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:WaveshaperPlugin"
39+
#define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Distortion"
3940

4041
#endif // DISTRHO_PLUGIN_INFO_H_INCLUDED

0 commit comments

Comments
 (0)