Update to CLAP 1.1.7

Factories got moved to a new `factory` directory.
This commit is contained in:
Robbert van der Helm
2023-01-27 21:03:43 +01:00
parent 29acd40a9a
commit d58c204178
15 changed files with 46 additions and 39 deletions
+4 -4
View File
@@ -54,14 +54,14 @@ void ClapLogger::log_on_main_thread(size_t instance_id) {
}
bool ClapLogger::log_request(bool is_host_plugin,
const clap::plugin_factory::List&) {
const clap::factory::plugin_factory::List&) {
return log_request_base(is_host_plugin, [&](auto& message) {
message << "clap_plugin_factory::list()";
});
}
bool ClapLogger::log_request(bool is_host_plugin,
const clap::plugin_factory::Create& request) {
const clap::factory::plugin_factory::Create& request) {
return log_request_base(is_host_plugin, [&](auto& message) {
message << "clap_plugin_factory::create(host = <clap_host_t*>, "
"plugin_id = \""
@@ -769,7 +769,7 @@ void ClapLogger::log_response(bool is_host_plugin, const Ack&) {
void ClapLogger::log_response(
bool is_host_plugin,
const clap::plugin_factory::ListResponse& response) {
const clap::factory::plugin_factory::ListResponse& response) {
log_response_base(is_host_plugin, [&](auto& message) {
if (response.descriptors) {
message << "<clap_plugin_factory* containing "
@@ -782,7 +782,7 @@ void ClapLogger::log_response(
void ClapLogger::log_response(
bool is_host_plugin,
const clap::plugin_factory::CreateResponse& response) {
const clap::factory::plugin_factory::CreateResponse& response) {
log_response_base(is_host_plugin, [&](auto& message) {
if (response.instance_id) {
message << "<clap_plugin_t* with instance ID "
+4 -4
View File
@@ -80,8 +80,8 @@ class ClapLogger {
// log message for the response together with the request.
// Main thread control messages
bool log_request(bool is_host_plugin, const clap::plugin_factory::List&);
bool log_request(bool is_host_plugin, const clap::plugin_factory::Create&);
bool log_request(bool is_host_plugin, const clap::factory::plugin_factory::List&);
bool log_request(bool is_host_plugin, const clap::factory::plugin_factory::Create&);
bool log_request(bool is_host_plugin, const clap::plugin::Init&);
bool log_request(bool is_host_plugin, const clap::plugin::Destroy&);
bool log_request(bool is_host_plugin, const clap::plugin::Activate&);
@@ -207,9 +207,9 @@ class ClapLogger {
// Main thread control message responses
void log_response(bool is_host_plugin, const Ack&);
void log_response(bool is_host_plugin,
const clap::plugin_factory::ListResponse&);
const clap::factory::plugin_factory::ListResponse&);
void log_response(bool is_host_plugin,
const clap::plugin_factory::CreateResponse&);
const clap::factory::plugin_factory::CreateResponse&);
void log_response(bool is_host_plugin, const clap::plugin::InitResponse&);
void log_response(bool is_host_plugin,
const clap::plugin::ActivateResponse&);
+3 -3
View File
@@ -35,8 +35,8 @@
#include "clap/ext/state.h"
#include "clap/ext/tail.h"
#include "clap/ext/voice-info.h"
#include "clap/factory/plugin-factory.h"
#include "clap/host.h"
#include "clap/plugin-factory.h"
#include "clap/process.h"
#include "common.h"
@@ -55,8 +55,8 @@
// serialize this without it.
using ClapMainThreadControlRequest =
std::variant<WantsConfiguration,
clap::plugin_factory::List,
clap::plugin_factory::Create,
clap::factory::plugin_factory::List,
clap::factory::plugin_factory::Create,
clap::plugin::Init,
clap::plugin::Destroy,
clap::plugin::Activate,
@@ -16,17 +16,19 @@
#pragma once
#include "../common.h"
#include "host.h"
#include "plugin.h"
#include "../../common.h"
#include "../host.h"
#include "../plugin.h"
// Serialization messages for `clap/plugin-factory.h`
namespace clap {
namespace factory {
namespace plugin_factory {
/**
* The response to the `clap::plugin_factory::List` message defined below.
* The response to the `clap::factory::plugin_factory::List` message defined
* below.
*/
struct ListResponse {
/**
@@ -57,7 +59,8 @@ struct List {
};
/**
* The response to the `clap::plugin_factory::Create` message defined below.
* The response to the `clap::factory::plugin_factory::Create` message defined
* below.
*/
struct CreateResponse {
/**
@@ -99,4 +102,5 @@ struct Create {
};
} // namespace plugin_factory
} // namespace factory
} // namespace clap