vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-07 03:50:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fully implement CLAP note name extension

Browse Source
This commit is contained in:
Robbert van der Helm
2022-10-21 17:17:50 +02:00
parent e2ec0e286f
commit aa586d40ee
8 changed files with 81 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/serialization/clap.h
+2
View File
@@ -79,6 +79,8 @@ using ClapMainThreadControlRequest =
clap::ext::gui::plugin::Show,
clap::ext::gui::plugin::Hide,
clap::ext::latency::plugin::Get,
clap::ext::note_name::plugin::Count,
clap::ext::note_name::plugin::Get,
clap::ext::note_ports::plugin::Count,
clap::ext::note_ports::plugin::Get,
clap::ext::params::plugin::Count,
src/common/serialization/clap/README.md
+1 -1
View File
@@ -23,7 +23,7 @@ Yabridge currently tracks CLAP 1.1.1. The implementation status for CLAP's core
| `clap.gui` | :heavy_check_mark: Currently only does embedded GUIs |
| `clap.latency` | :heavy_check_mark: |
| `clap.log` | :heavy_check_mark: Always supported with or without bridging |
| `clap.note-name` | :x: Not supported yet |
| `clap.note-name` | :heavy_check_mark: |
| `clap.note-ports` | :heavy_check_mark: |
| `clap.params` | :heavy_check_mark: |
| `clap.posix-fd-support` | :heavy_exclamation_mark: Not used by Windows plugins |
src/common/serialization/clap/plugin.cpp
+3 -1
View File
@@ -20,6 +20,7 @@
#include <clap/ext/audio-ports.h>
#include <clap/ext/gui.h>
#include <clap/ext/latency.h>
#include <clap/ext/note-name.h>
#include <clap/ext/note-ports.h>
#include <clap/ext/params.h>
#include <clap/ext/render.h>
@@ -85,12 +86,13 @@ const clap_plugin_descriptor_t* Descriptor::get() const {
return &clap_descriptor;
}
std::array<std::pair<bool, const char*>, 10> SupportedPluginExtensions::list()
std::array<std::pair<bool, const char*>, 11> SupportedPluginExtensions::list()
const noexcept {
return {std::pair(supports_audio_ports, CLAP_EXT_AUDIO_PORTS),
std::pair(supports_audio_ports_config, CLAP_EXT_AUDIO_PORTS_CONFIG),
std::pair(supports_gui, CLAP_EXT_GUI),
std::pair(supports_latency, CLAP_EXT_LATENCY),
std::pair(supports_note_name, CLAP_EXT_NOTE_NAME),
std::pair(supports_note_ports, CLAP_EXT_NOTE_PORTS),
std::pair(supports_params, CLAP_EXT_PARAMS),
std::pair(supports_render, CLAP_EXT_RENDER),
src/common/serialization/clap/plugin.h
+3 -1
View File
@@ -119,6 +119,7 @@ struct SupportedPluginExtensions {
bool supports_audio_ports_config = false;
bool supports_gui = false;
bool supports_latency = false;
bool supports_note_name = false;
bool supports_note_ports = false;
bool supports_params = false;
bool supports_render = false;
@@ -130,7 +131,7 @@ struct SupportedPluginExtensions {
* Get a list of `<bool, extension_name>` tuples for the supported
* extensions. Used during logging.
*/
std::array<std::pair<bool, const char*>, 10> list() const noexcept;
std::array<std::pair<bool, const char*>, 11> list() const noexcept;
template <typename S>
void serialize(S& s) {
@@ -138,6 +139,7 @@ struct SupportedPluginExtensions {
s.value1b(supports_audio_ports_config);
s.value1b(supports_gui);
s.value1b(supports_latency);
s.value1b(supports_note_name);
s.value1b(supports_note_ports);
s.value1b(supports_params);
s.value1b(supports_render);
src/plugin/bridges/clap-impls/plugin-proxy.cpp
+37
View File
@@ -111,6 +111,10 @@ clap_plugin_proxy::clap_plugin_proxy(ClapPluginBridge& bridge,
ext_latency_vtable(clap_plugin_latency_t{
.get = ext_latency_get,
}),
ext_note_name_vtable(clap_plugin_note_name_t{
.count = ext_note_name_count,
.get = ext_note_name_get,
}),
ext_note_ports_vtable(clap_plugin_note_ports_t{
.count = ext_note_ports_count,
.get = ext_note_ports_get,
@@ -322,6 +326,9 @@ clap_plugin_proxy::plugin_get_extension(const struct clap_plugin* plugin,
} else if (self->supported_extensions_.supports_latency &&
strcmp(id, CLAP_EXT_LATENCY) == 0) {
extension_ptr = &self->ext_latency_vtable;
} else if (self->supported_extensions_.supports_note_name &&
strcmp(id, CLAP_EXT_NOTE_NAME) == 0) {
extension_ptr = &self->ext_note_name_vtable;
} else if (self->supported_extensions_.supports_note_ports &&
strcmp(id, CLAP_EXT_NOTE_PORTS) == 0) {
extension_ptr = &self->ext_note_ports_vtable;
@@ -641,6 +648,36 @@ clap_plugin_proxy::ext_latency_get(const clap_plugin_t* plugin) {
clap::ext::latency::plugin::Get{.instance_id = self->instance_id()});
}
uint32_t CLAP_ABI
clap_plugin_proxy::ext_note_name_count(const clap_plugin_t* plugin) {
assert(plugin && plugin->plugin_data);
auto self = static_cast<const clap_plugin_proxy*>(plugin->plugin_data);
return self->bridge_.send_main_thread_message(
clap::ext::note_name::plugin::Count{.instance_id =
self->instance_id()});
}
bool CLAP_ABI
clap_plugin_proxy::ext_note_name_get(const clap_plugin_t* plugin,
uint32_t index,
clap_note_name_t* note_name) {
assert(plugin && plugin->plugin_data && note_name);
auto self = static_cast<const clap_plugin_proxy*>(plugin->plugin_data);
const clap::ext::note_name::plugin::GetResponse response =
self->bridge_.send_main_thread_message(
clap::ext::note_name::plugin::Get{
.instance_id = self->instance_id(), .index = index});
if (response.result) {
response.result->reconstruct(*note_name);
return true;
} else {
return false;
}
}
uint32_t CLAP_ABI
clap_plugin_proxy::ext_note_ports_count(const clap_plugin_t* plugin,
bool is_input) {
src/plugin/bridges/clap-impls/plugin-proxy.h
+6
View File
@@ -246,6 +246,11 @@ class clap_plugin_proxy {
static uint32_t CLAP_ABI ext_latency_get(const clap_plugin_t* plugin);
static uint32_t CLAP_ABI ext_note_name_count(const clap_plugin_t* plugin);
static bool CLAP_ABI ext_note_name_get(const clap_plugin_t* plugin,
uint32_t index,
clap_note_name_t* note_name);
static uint32_t CLAP_ABI ext_note_ports_count(const clap_plugin_t* plugin,
bool is_input);
static bool CLAP_ABI ext_note_ports_get(const clap_plugin_t* plugin,
@@ -348,6 +353,7 @@ class clap_plugin_proxy {
const clap_plugin_audio_ports_config_t ext_audio_ports_config_vtable;
const clap_plugin_gui_t ext_gui_vtable;
const clap_plugin_latency_t ext_latency_vtable;
const clap_plugin_note_name_t ext_note_name_vtable;
const clap_plugin_note_ports_t ext_note_ports_vtable;
const clap_plugin_params_t ext_params_vtable;
const clap_plugin_render_t ext_render_vtable;
src/wine-host/bridges/clap.cpp
+28
View File
@@ -35,6 +35,8 @@ ClapPluginExtensions::ClapPluginExtensions(const clap_plugin& plugin) noexcept
plugin.get_extension(&plugin, CLAP_EXT_GUI))),
latency(static_cast<const clap_plugin_latency_t*>(
plugin.get_extension(&plugin, CLAP_EXT_LATENCY))),
note_name(static_cast<const clap_plugin_note_name_t*>(
plugin.get_extension(&plugin, CLAP_EXT_NOTE_NAME))),
note_ports(static_cast<const clap_plugin_note_ports_t*>(
plugin.get_extension(&plugin, CLAP_EXT_NOTE_PORTS))),
params(static_cast<const clap_plugin_params_t*>(
@@ -57,6 +59,7 @@ clap::plugin::SupportedPluginExtensions ClapPluginExtensions::supported()
.supports_audio_ports_config = audio_ports_config != nullptr,
.supports_gui = gui != nullptr,
.supports_latency = latency != nullptr,
.supports_note_name = note_name != nullptr,
.supports_note_ports = note_ports != nullptr,
.supports_params = params != nullptr,
.supports_render = render != nullptr,
@@ -660,6 +663,31 @@ void ClapBridge::run() {
// to avoid the synchronisation costs in hot code paths
return instance.extensions.latency->get(instance.plugin.get());
},
[&](const clap::ext::note_name::plugin::Count& request)
-> clap::ext::note_name::plugin::Count::Response {
const auto& [instance, _] = get_instance(request.instance_id);
// We'll ignore the main thread requirement for simple array
// lookups to avoid the synchronisation costs in hot code paths
return instance.extensions.note_name->count(
instance.plugin.get());
},
[&](const clap::ext::note_name::plugin::Get& request)
-> clap::ext::note_name::plugin::Get::Response {
const auto& [instance, _] = get_instance(request.instance_id);
// We'll ignore the main thread requirement for simple array
// lookups to avoid the synchronisation costs in hot code paths
clap_note_name_t note_name{};
if (instance.extensions.note_name->get(
instance.plugin.get(), request.index, &note_name)) {
return clap::ext::note_name::plugin::GetResponse{
.result = note_name};
} else {
return clap::ext::note_name::plugin::GetResponse{
.result = std::nullopt};
}
},
[&](const clap::ext::note_ports::plugin::Count& request)
-> clap::ext::note_ports::plugin::Count::Response {
const auto& [instance, _] = get_instance(request.instance_id);
src/wine-host/bridges/clap.h
+1
View File
@@ -70,6 +70,7 @@ struct ClapPluginExtensions {
const clap_plugin_audio_ports_config_t* audio_ports_config = nullptr;
const clap_plugin_gui_t* gui = nullptr;
const clap_plugin_latency_t* latency = nullptr;
const clap_plugin_note_name_t* note_name = nullptr;
const clap_plugin_note_ports_t* note_ports = nullptr;
const clap_plugin_params_t* params = nullptr;
const clap_plugin_render_t* render = nullptr;