Skip to content

Implement several multi-layout extensions for VST3 #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Quant1um wants to merge 1 commit into
base: next
Choose a base branch
from
Open

Implement several multi-layout extensions for VST3 #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions src/clap_proxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ void Plugin::connectClap(const clap_plugin_t *clap)
getExtension(_plugin, _ext._configurable_audio_ports, CLAP_EXT_CONFIGURABLE_AUDIO_PORTS);
if (!_ext._configurable_audio_ports)
getExtension(_plugin, _ext._configurable_audio_ports, CLAP_EXT_CONFIGURABLE_AUDIO_PORTS_COMPAT);
getExtension(_plugin, _ext._audio_ports_activation, CLAP_EXT_AUDIO_PORTS_ACTIVATION);
getExtension(_plugin, _ext._noteports, CLAP_EXT_NOTE_PORTS);
getExtension(_plugin, _ext._latency, CLAP_EXT_LATENCY);
getExtension(_plugin, _ext._render, CLAP_EXT_RENDER);
Expand Down Expand Up @@ -323,6 +324,14 @@ void Plugin::setBlockSizes(uint32_t minFrames, uint32_t maxFrames)
_audioSetup.maxFrames = maxFrames;
}

void Plugin::setBusActivation(bool isInput, uint32_t busIndex, bool active)
{
if (_ext._audio_ports_activation)
{
_ext._audio_ports_activation->set_active(_plugin, isInput, busIndex, active, 32);
}
}

bool Plugin::load(const clap_istream_t *stream) const
{
if (_ext._state)
Expand Down Expand Up @@ -526,23 +535,22 @@ void Plugin::param_request_flush()
// [thread-safe]
const void *Plugin::clapExtension(const clap_host * /*host*/, const char *extension)
{
// TODO: add 'audio-ports' host-side extension
if (!strcmp(extension, CLAP_EXT_LOG)) return &HostExt::log;
if (!strcmp(extension, CLAP_EXT_PARAMS)) return &HostExt::params;
if (!strcmp(extension, CLAP_EXT_TRACK_INFO)) return &HostExt::trackinfo;
if (!strcmp(extension, CLAP_EXT_THREAD_CHECK)) return &HostExt::threadcheck;
if (!strcmp(extension, CLAP_EXT_GUI)) return &HostExt::hostgui;
if (!strcmp(extension, CLAP_EXT_TIMER_SUPPORT)) return &HostExt::hosttimer;
#if LIN
if (!strcmp(extension, CLAP_EXT_POSIX_FD_SUPPORT)) return &HostExt::hostposixfd;
#endif
if (!strcmp(extension, CLAP_EXT_LATENCY)) return &HostExt::latency;
if (!strcmp(extension, CLAP_EXT_TAIL))
{
return &HostExt::tail;
}
if (!strcmp(extension, CLAP_EXT_TAIL)) return &HostExt::tail;
if (!strcmp(extension, CLAP_EXT_STATE)) return &HostExt::state;
if (!strcmp(extension, CLAP_EXT_CONTEXT_MENU)) return &HostExt::context_menu;

#if LIN
if (!strcmp(extension, CLAP_EXT_POSIX_FD_SUPPORT)) return &HostExt::hostposixfd;
#endif

return nullptr;
}

Expand Down
2 changes: 2 additions & 0 deletions src/clap_proxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ struct ClapPluginExtensions
const clap_plugin_state_t *_state = nullptr;
const clap_plugin_params_t *_params = nullptr;
const clap_plugin_audio_ports_t *_audioports = nullptr;
const clap_plugin_audio_ports_activation_t *_audio_ports_activation = nullptr;
const clap_plugin_configurable_audio_ports_t *_configurable_audio_ports = nullptr;
const clap_plugin_gui_t *_gui = nullptr;
const clap_plugin_note_ports_t *_noteports = nullptr;
Expand Down Expand Up @@ -171,6 +172,7 @@ class Plugin
void schnick();
bool initialize();
void terminate();
void setBusActivation(bool isInput, uint32_t busIndex, bool active);
void setSampleRate(double sampleRate);
double getSampleRate() const
{
Expand Down
17 changes: 17 additions & 0 deletions src/detail/shared/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
#pragma once

#include <cstdint>
#include <string>

#if __cplusplus >= 202002L
#include <bit>
Comment thread
Quant1um marked this conversation as resolved.
#endif

uint32_t fnv1a_keogh(const char *input);

// Function to shorten a string to a 4-character string
std::string ShortenString(const std::string &input);

inline uint32_t popcount64(uint64_t x)
{
#if __cplusplus >= 202002L
return std::popcount(x);
#else
x = x - ((x >> 1) & 0x5555555555555555ULL);
x = (x & 0x3333333333333333ULL) + ((x >> 2) & 0x3333333333333333ULL);
x = (x + (x >> 4)) & 0x0F0F0F0F0F0F0F0FULL;
return (x * 0x0101010101010101ULL) >> 56;
#endif
}
140 changes: 95 additions & 45 deletions src/wrapasvst3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "detail/vst3/process.h"
#include "detail/vst3/parameter.h"
#include "detail/clap/fsutil.h"
#include "detail/shared/util.h"
#include <locale>
#include <sstream>

Expand Down Expand Up @@ -182,21 +183,31 @@ tresult PLUGIN_API ClapAsVst3::setActive(TBool state)
if (state)
{
if (_active) return kResultFalse;
if (!_plugin->activate()) return kResultFalse;
_active = true;
_processAdapter = new Clap::ProcessAdapter();

auto supportsnoteexpression =
(_expressionmap & clap_supported_note_expressions::AS_VST3_NOTE_EXPRESSION_PRESSURE);
for (auto i = 0U; i < audioInputs.size(); ++i)
{
_plugin->setBusActivation(true, i, audioInputs[i]->isActive());
}

for (auto i = 0U; i < audioOutputs.size(); ++i)
{
_plugin->setBusActivation(false, i, audioOutputs[i]->isActive());
}

if (!_plugin->activate()) return kResultFalse;

_gesturedparameters.reserve(8192);

// the processAdapter needs to know a few things to intercommunicate between VST3 host and CLAP plugin.
_active = true;
_processAdapter = new Clap::ProcessAdapter();
_processAdapter->setupProcessing(
_plugin->_plugin, _plugin->_ext._params, this->audioInputs, this->audioOutputs,
this->_largestBlocksize, this->eventInputs.size(), this->eventOutputs.size(), parameters,
componentHandler, this, _gesturedparameters, supportsnoteexpression,
componentHandler, this, _gesturedparameters,
_expressionmap & clap_supported_note_expressions::AS_VST3_NOTE_EXPRESSION_PRESSURE,
_expressionmap & clap_supported_note_expressions::AS_VST3_NOTE_EXPRESSION_TUNING);

// do we need this still?
updateAudioBusses();

if (_missedLatencyRequest)
Expand Down Expand Up @@ -360,40 +371,67 @@ tresult PLUGIN_API ClapAsVst3::setBusArrangements(Vst::SpeakerArrangement *input

auto raise = _plugin->AlwaysMainThread();

int32_t inc = _plugin->_ext._audioports->count(_plugin->_plugin, true);
int32_t ouc = _plugin->_ext._audioports->count(_plugin->_plugin, false);
if (inc != numIns || ouc != numOuts)
// if we have configurable-audio-ports, ask the plugin to set the requested arrangement
if (_plugin->_ext._configurable_audio_ports)
{
return kResultFalse;
}
std::vector<clap_audio_port_configuration_request_t> requests;

for (int i = 0; i < numIns; ++i)
{
clap_audio_port_info_t info;
_plugin->_ext._audioports->get(_plugin->_plugin, i, true, &info);
Vst::SpeakerArrangement sa{0};
for (auto c = 0U; c < info.channel_count; ++c)
for (int i = 0; i < numIns + numOuts; ++i)
{
sa = (sa << 1) + 1;
clap_audio_port_configuration_request_t request;

request.is_input = i < numIns;
request.port_index = i < numIns ? i : (i - numIns);
auto arrangement = i < numIns ? inputs[i] : outputs[i - numIns];

switch (arrangement)
{
case Vst::SpeakerArr::kMono:
request.channel_count = 1;
request.port_type = CLAP_PORT_MONO;
request.port_details = nullptr;
break;
case Vst::SpeakerArr::kStereo:
request.channel_count = 2;
request.port_type = CLAP_PORT_STEREO;
request.port_details = nullptr;
break;
default:
request.channel_count = popcount64(arrangement);
request.port_type = nullptr;
request.port_details = nullptr;
break;
}

requests.push_back(request);
}
if (inputs[i] != sa)

if (_plugin->_ext._configurable_audio_ports->apply_configuration(
_plugin->_plugin, requests.data(), static_cast<uint32_t>(requests.size())))
{
return kResultFalse;
setupAudioBusses(_plugin->_plugin, _plugin->_ext._audioports);
return super::setBusArrangements(inputs, numIns, outputs, numOuts);
}
}

for (int i = 0; i < numOuts; ++i)
// otherwise we just make sure that the requested arrangements matches the current layout
{
clap_audio_port_info_t info;
_plugin->_ext._audioports->get(_plugin->_plugin, i, false, &info);
Vst::SpeakerArrangement sa{0};
for (auto c = 0U; c < info.channel_count; ++c)
int32_t inc = _plugin->_ext._audioports->count(_plugin->_plugin, true);
int32_t ouc = _plugin->_ext._audioports->count(_plugin->_plugin, false);
if (inc != numIns || ouc != numOuts) return kResultFalse;

for (int i = 0; i < numIns; ++i)
{
sa = (sa << 1) + 1;
clap_audio_port_info_t info;
_plugin->_ext._audioports->get(_plugin->_plugin, i, true, &info);
if (popcount64(inputs[i]) != info.channel_count) return kResultFalse;
}
if (outputs[i] != sa)

for (int i = 0; i < numOuts; ++i)
{
return kResultFalse;
clap_audio_port_info_t info;
_plugin->_ext._audioports->get(_plugin->_plugin, i, false, &info);
if (popcount64(outputs[i]) != info.channel_count) return kResultFalse;
}
}

Expand Down Expand Up @@ -705,33 +743,42 @@ ARAPlugInExtensionInstancePtr PLUGIN_API ClapAsVst3::bindToDocumentControllerWit
return nullptr;
}

static Vst::SpeakerArrangement speakerArrFromPortType(const char *port_type)
// TODO: surround extension support
static Vst::SpeakerArrangement speakerArrFromPortType(const char *port_type, uint32_t channel_count)
{
if (!port_type) return Vst::SpeakerArr::kEmpty;
static const std::pair<const char *, Vst::SpeakerArrangement> arrangementmap[] = {
{CLAP_PORT_MONO, Vst::SpeakerArr::kMono},
{CLAP_PORT_STEREO, Vst::SpeakerArr::kStereo},
// {CLAP_PORT_AMBISONIC, Vst::SpeakerArr::kAmbi1stOrderACN} <- we need also CLAP_EXT_AMBISONIC
// {CLAP_PORT_SURROUND, Vst::SpeakerArr::kStereoSurround}, // add when CLAP_EXT_SURROUND is not draft anymore
// TODO: add more PortTypes to Speaker Arrangement
{nullptr, Vst::SpeakerArr::kEmpty}};

auto p = &arrangementmap[0];
while (p->first)
if (!port_type)
{
if (!strcmp(port_type, p->first))
switch (channel_count)
{
return p->second;
case 0:
return Vst::SpeakerArr::kEmpty;
case 1:
return Vst::SpeakerArr::kMono;
case 2:
return Vst::SpeakerArr::kStereo;
case 5:
return Vst::SpeakerArr::k50;
case 6:
return Vst::SpeakerArr::k51;
case 7:
return Vst::SpeakerArr::k70Cine;
case 8:
return Vst::SpeakerArr::k71Cine;
default:
return (1 << channel_count) - 1; // bitmask with channel_count bits set
}
++p;
}

if (!strcmp(port_type, CLAP_PORT_MONO)) return Vst::SpeakerArr::kMono;
if (!strcmp(port_type, CLAP_PORT_STEREO)) return Vst::SpeakerArr::kStereo;

return Vst::SpeakerArr::kEmpty;
}

void ClapAsVst3::addAudioBusFrom(const clap_audio_port_info_t *info, bool is_input)
{
auto spk = speakerArrFromPortType(info->port_type);
auto spk = speakerArrFromPortType(info->port_type, info->channel_count);

auto bustype = Vst::BusTypes::kMain; // actually, everything is main, except
if (is_input && !(info->flags & CLAP_AUDIO_PORT_IS_MAIN))
{
Expand Down Expand Up @@ -897,6 +944,9 @@ void ClapAsVst3::setupAudioBusses(const clap_plugin_t *plugin,
const clap_plugin_audio_ports_t *audioports)
{
if (!audioports) return;

removeAudioBusses();

auto numAudioInputs = audioports->count(plugin, true);
auto numAudioOutputs = audioports->count(plugin, false);

Expand Down
Loading
Loading