From 7eb7e87953e3d1ef86f1f7457da789edfdeacd96 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Thu, 17 Dec 2020 21:50:04 +0100 Subject: [PATCH] Implement IEditController::setComponentState() --- src/common/logging/vst3.cpp | 10 ++++++++++ src/common/logging/vst3.h | 2 ++ src/common/serialization/vst3.h | 1 + .../vst3/plugin/edit-controller.h | 18 ++++++++++++++++++ src/plugin/bridges/vst3-impls/plugin-proxy.cpp | 5 ++--- src/wine-host/bridges/vst3.cpp | 5 +++++ 6 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/common/logging/vst3.cpp b/src/common/logging/vst3.cpp index 8678c48c..7ac9fc7e 100644 --- a/src/common/logging/vst3.cpp +++ b/src/common/logging/vst3.cpp @@ -264,6 +264,16 @@ void Vst3Logger::log_request(bool is_host_vst, }); } +void Vst3Logger::log_request( + bool is_host_vst, + const YaEditController2::SetComponentState& request) { + log_request_base(is_host_vst, [&](auto& message) { + message << "::setComponentState(state = )"; + }); +} + void Vst3Logger::log_request(bool is_host_vst, const YaPluginBase::Initialize& request) { log_request_base(is_host_vst, [&](auto& message) { diff --git a/src/common/logging/vst3.h b/src/common/logging/vst3.h index 65c3ff4a..6c7d668b 100644 --- a/src/common/logging/vst3.h +++ b/src/common/logging/vst3.h @@ -79,6 +79,8 @@ class Vst3Logger { void log_request(bool is_host_vst, const YaComponent::GetRoutingInfo&); void log_request(bool is_host_vst, const YaComponent::ActivateBus&); void log_request(bool is_host_vst, const YaComponent::SetActive&); + void log_request(bool is_host_vst, + const YaEditController2::SetComponentState&); void log_request(bool is_host_vst, const YaPluginBase::Initialize&); void log_request(bool is_host_vst, const YaPluginBase::Terminate&); void log_request(bool is_host_vst, const YaPluginFactory::Construct&); diff --git a/src/common/serialization/vst3.h b/src/common/serialization/vst3.h index 5cb7549f..a59f9831 100644 --- a/src/common/serialization/vst3.h +++ b/src/common/serialization/vst3.h @@ -75,6 +75,7 @@ using ControlRequest = std::variant + void serialize(S& s) { + s.value8b(instance_id); + s.object(state); + } + }; + virtual tresult PLUGIN_API setComponentState(Steinberg::IBStream* state) override = 0; diff --git a/src/plugin/bridges/vst3-impls/plugin-proxy.cpp b/src/plugin/bridges/vst3-impls/plugin-proxy.cpp index 00c7944d..1e4cea8f 100644 --- a/src/plugin/bridges/vst3-impls/plugin-proxy.cpp +++ b/src/plugin/bridges/vst3-impls/plugin-proxy.cpp @@ -190,9 +190,8 @@ tresult PLUGIN_API Vst3PluginProxyImpl::getState(Steinberg::IBStream* state) { tresult PLUGIN_API Vst3PluginProxyImpl::setComponentState(Steinberg::IBStream* state) { - // TODO: Implement - bridge.logger.log("TODO IEditController::setComponentState()"); - return Steinberg::kNotImplemented; + return bridge.send_message(YaEditController2::SetComponentState{ + .instance_id = arguments.instance_id, .state = state}); } int32 PLUGIN_API Vst3PluginProxyImpl::getParameterCount() { diff --git a/src/wine-host/bridges/vst3.cpp b/src/wine-host/bridges/vst3.cpp index f6dfd607..3eb353cd 100644 --- a/src/wine-host/bridges/vst3.cpp +++ b/src/wine-host/bridges/vst3.cpp @@ -232,6 +232,11 @@ void Vst3Bridge::run() { return object_instances[request.instance_id] .component->setActive(request.state); }, + [&](YaEditController2::SetComponentState& request) + -> YaEditController2::SetComponentState::Response { + return object_instances[request.instance_id] + .edit_controller->setComponentState(&request.state); + }, [&](YaPluginBase::Initialize& request) -> YaPluginBase::Initialize::Response { // If we got passed a host context, we'll create a proxy object