ardour/livetrax
13
0
Fork 0
Code

VST3: set numChannels to match the speaker-arrangement

Browse Source 
This fixes an issue with recent JUCE when using a stereo
plugin on a mono track.

`juce::validateLayouts` requires that numChnanels matches
the configured channel-mapping:
69795dc8e5/modules/juce_audio_processors/format_types/juce_VST3Common.h (L630)
JUCE could be more liberal and accept
`(int) mapIterator->size() > it->numChannels`
This commit is contained in:
Robin Gareus 2023-03-17 05:57:36 +01:00
parent 05a13e151e
commit 6cb90471fe
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/vst3_plugin.h
View File

@ -143,10 +143,11 @@ public:
uint32_t n_audio_aux_out () const { return _n_aux_outputs; } uint32_t n_audio_aux_out () const { return _n_aux_outputs; }
struct AudioBusInfo { struct AudioBusInfo {
AudioBusInfo (Vst::BusType t, int32_t c, bool a) : type (t), n_chn (c), dflt (a) {} AudioBusInfo (Vst::BusType t, int32_t c, bool a) : type (t), n_chn (c), n_used_chn (c), dflt (a) {}
AudioBusInfo () : type (Vst::kMain), n_chn (0) {} AudioBusInfo () : type (Vst::kMain), n_chn (0), n_used_chn (0) {}
Vst::BusType type; Vst::BusType type;
int32_t n_chn; int32_t n_chn;
int32_t n_used_chn;
bool dflt; // kDefaultActive bool dflt; // kDefaultActive
}; };

13
libs/ardour/vst3_plugin.cc
View File

@ -2138,9 +2138,11 @@ VST3PI::enable_io (std::vector<bool> const& ins, std::vector<bool> const& outs)
while (sa_in.size () < (VSTSpeakerArrangements::size_type) _n_bus_in) { while (sa_in.size () < (VSTSpeakerArrangements::size_type) _n_bus_in) {
bool enable = false; bool enable = false;
Vst::SpeakerArrangement sa = 0; Vst::SpeakerArrangement sa = 0;
_bus_info_in[sa_in.size ()].n_used_chn = 0;
for (int i = 0; i < _bus_info_in[sa_in.size ()].n_chn; ++i) { for (int i = 0; i < _bus_info_in[sa_in.size ()].n_chn; ++i) {
if (ins[cnt++]) { if (ins[cnt++]) {
sa |= (uint64_t)1 << i; sa |= (uint64_t)1 << i;
++_bus_info_in[sa_in.size ()].n_used_chn;
enable = true; enable = true;
} }
} }
@ -2149,7 +2151,7 @@ VST3PI::enable_io (std::vector<bool> const& ins, std::vector<bool> const& outs)
sa = Vst::SpeakerArr::kMono; /* 1 << 19 */ sa = Vst::SpeakerArr::kMono; /* 1 << 19 */
} }
DEBUG_TRACE (DEBUG::VST3Config, string_compose ("VST3PI::enable_io: activateBus (kAudio, kInput, %1, %2, %3%4)\n", sa_in.size (), enable, std::hex, sa)); DEBUG_TRACE (DEBUG::VST3Config, string_compose ("VST3PI::enable_io: activateBus (kAudio, kInput, %1, %2) used-chn: %3 spk-arr: %4\n", sa_in.size (), enable, _bus_info_in[sa_in.size ()].n_used_chn, std::hex, sa));
_component->activateBus (Vst::kAudio, Vst::kInput, sa_in.size (), enable); _component->activateBus (Vst::kAudio, Vst::kInput, sa_in.size (), enable);
sa_in.push_back (sa); sa_in.push_back (sa);
} }
@ -2158,9 +2160,11 @@ VST3PI::enable_io (std::vector<bool> const& ins, std::vector<bool> const& outs)
while (sa_out.size () < (VSTSpeakerArrangements::size_type) _n_bus_out) { while (sa_out.size () < (VSTSpeakerArrangements::size_type) _n_bus_out) {
bool enable = false; bool enable = false;
Vst::SpeakerArrangement sa = 0; Vst::SpeakerArrangement sa = 0;
_bus_info_out[sa_out.size ()].n_used_chn = 0;
for (int i = 0; i < _bus_info_out[sa_out.size ()].n_chn; ++i) { for (int i = 0; i < _bus_info_out[sa_out.size ()].n_chn; ++i) {
if (outs[cnt++]) { if (outs[cnt++]) {
sa |= (uint64_t)1 << i; sa |= (uint64_t)1 << i;
++_bus_info_out[sa_out.size ()].n_used_chn;
enable = true; enable = true;
} }
} }
@ -2168,7 +2172,7 @@ VST3PI::enable_io (std::vector<bool> const& ins, std::vector<bool> const& outs)
if (sa == 1 /*Vst::SpeakerArr::kSpeakerL */) { if (sa == 1 /*Vst::SpeakerArr::kSpeakerL */) {
sa = Vst::SpeakerArr::kMono; /* 1 << 19 */ sa = Vst::SpeakerArr::kMono; /* 1 << 19 */
} }
DEBUG_TRACE (DEBUG::VST3Config, string_compose ("VST3PI::enable_io: activateBus (kAudio, kOutput, %1, %2, %3%4)\n", sa_out.size (), enable, std::hex, sa)); DEBUG_TRACE (DEBUG::VST3Config, string_compose ("VST3PI::enable_io: activateBus (kAudio, kOutput, %1, %2) used-chn: %3 spk-arr: %4\n", sa_out.size (), enable, _bus_info_out[sa_out.size ()].n_used_chn, std::hex, sa));
_component->activateBus (Vst::kAudio, Vst::kOutput, sa_out.size (), enable); _component->activateBus (Vst::kAudio, Vst::kOutput, sa_out.size (), enable);
sa_out.push_back (sa); sa_out.push_back (sa);
} }
@ -2200,6 +2204,7 @@ VST3PI::enable_io (std::vector<bool> const& ins, std::vector<bool> const& outs)
} }
} }
#endif #endif
if (was_active) { if (was_active) {
activate (); activate ();
} }
@ -2232,14 +2237,14 @@ VST3PI::process (float** ins, float** outs, uint32_t n_samples)
for (int i = 0; i < _n_bus_in; ++i) { for (int i = 0; i < _n_bus_in; ++i) {
inputs[i].silenceFlags = 0; inputs[i].silenceFlags = 0;
inputs[i].numChannels = _bus_info_in[i].n_chn; inputs[i].numChannels = _bus_info_in[i].n_used_chn;
inputs[i].channelBuffers32 = &ins[used_ins]; inputs[i].channelBuffers32 = &ins[used_ins];
used_ins += _bus_info_in[i].n_chn; used_ins += _bus_info_in[i].n_chn;
} }
for (int i = 0; i < _n_bus_out; ++i) { for (int i = 0; i < _n_bus_out; ++i) {
outputs[i].silenceFlags = 0; outputs[i].silenceFlags = 0;
outputs[i].numChannels = _bus_info_out[i].n_chn; outputs[i].numChannels = _bus_info_out[i].n_used_chn;
outputs[i].channelBuffers32 = &outs[used_outs]; outputs[i].channelBuffers32 = &outs[used_outs];
used_outs += _bus_info_out[i].n_chn; used_outs += _bus_info_out[i].n_chn;
} }