From 60f6b30b845d3fa368868e6df3a22042a58b8a3d Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Sat, 26 Dec 2020 22:17:21 +0100 Subject: [PATCH] Implement IUnitInfo::getProgramListInfo --- src/common/logging/vst3.cpp | 22 ++++++++++ src/common/logging/vst3.h | 3 ++ src/common/serialization/vst3.h | 3 +- .../serialization/vst3/plugin/unit-info.h | 41 +++++++++++++++++++ .../bridges/vst3-impls/plugin-proxy.cpp | 10 +++-- src/wine-host/bridges/vst3.cpp | 10 +++++ 6 files changed, 85 insertions(+), 4 deletions(-) diff --git a/src/common/logging/vst3.cpp b/src/common/logging/vst3.cpp index 8922cde7..8ca1ef0d 100644 --- a/src/common/logging/vst3.cpp +++ b/src/common/logging/vst3.cpp @@ -453,6 +453,15 @@ bool Vst3Logger::log_request(bool is_host_vst, }); } +bool Vst3Logger::log_request(bool is_host_vst, + const YaUnitInfo::GetProgramListInfo& request) { + return log_request_base(is_host_vst, [&](auto& message) { + message << request.instance_id + << ": IUnitInfo::getProgramListInfo(listIndex = " + << request.list_index << ", &info)"; + }); +} + bool Vst3Logger::log_request( bool is_host_vst, const YaAudioProcessor::SetBusArrangements& request) { @@ -861,6 +870,19 @@ void Vst3Logger::log_response(bool is_host_vst, }); } +void Vst3Logger::log_response( + bool is_host_vst, + const YaUnitInfo::GetProgramListInfoResponse& response) { + log_response_base(is_host_vst, [&](auto& message) { + message << response.result.string(); + if (response.result == Steinberg::kResultOk) { + message << ", "; + } + }); +} + void Vst3Logger::log_response( bool is_host_vst, const YaAudioProcessor::GetBusArrangementResponse& response) { diff --git a/src/common/logging/vst3.h b/src/common/logging/vst3.h index 9ca88ec8..697975cf 100644 --- a/src/common/logging/vst3.h +++ b/src/common/logging/vst3.h @@ -111,6 +111,7 @@ class Vst3Logger { bool log_request(bool is_host_vst, const YaUnitInfo::GetUnitCount&); bool log_request(bool is_host_vst, const YaUnitInfo::GetUnitInfo&); bool log_request(bool is_host_vst, const YaUnitInfo::GetProgramListCount&); + bool log_request(bool is_host_vst, const YaUnitInfo::GetProgramListInfo&); bool log_request(bool is_host_vst, const YaAudioProcessor::SetBusArrangements&); @@ -165,6 +166,8 @@ class Vst3Logger { void log_response(bool is_host_vst, const YaPluginFactory::ConstructArgs&); void log_response(bool is_host_vst, const Configuration&); void log_response(bool is_host_vst, const YaUnitInfo::GetUnitInfoResponse&); + void log_response(bool is_host_vst, + const YaUnitInfo::GetProgramListInfoResponse&); void log_response(bool is_host_vst, const YaAudioProcessor::GetBusArrangementResponse&); diff --git a/src/common/serialization/vst3.h b/src/common/serialization/vst3.h index db1b1a60..279f2e90 100644 --- a/src/common/serialization/vst3.h +++ b/src/common/serialization/vst3.h @@ -102,7 +102,8 @@ using ControlRequest = std::variant; + YaUnitInfo::GetProgramListCount, + YaUnitInfo::GetProgramListInfo>; template void serialize(S& s, ControlRequest& payload) { diff --git a/src/common/serialization/vst3/plugin/unit-info.h b/src/common/serialization/vst3/plugin/unit-info.h index e4498710..21846b83 100644 --- a/src/common/serialization/vst3/plugin/unit-info.h +++ b/src/common/serialization/vst3/plugin/unit-info.h @@ -132,6 +132,40 @@ class YaUnitInfo : public Steinberg::Vst::IUnitInfo { }; virtual int32 PLUGIN_API getProgramListCount() override = 0; + + /** + * The response code and returned unit information for a call to + * `IUnitInfo::getProgramListInfo(list_index)`. + */ + struct GetProgramListInfoResponse { + UniversalTResult result; + Steinberg::Vst::ProgramListInfo info; + + template + void serialize(S& s) { + s.object(result); + s.object(info); + } + }; + + /** + * Message to pass through a call to + * `IUnitInfo::getProgramListInfo(list_index)` to the Wine plugin host. + */ + struct GetProgramListInfo { + using Response = GetProgramListInfoResponse; + + native_size_t instance_id; + + int32 list_index; + + template + void serialize(S& s) { + s.value8b(instance_id); + s.value4b(list_index); + } + }; + virtual tresult PLUGIN_API getProgramListInfo( int32 listIndex, Steinberg::Vst::ProgramListInfo& info /*out*/) override = 0; @@ -181,5 +215,12 @@ void serialize(S& s, UnitInfo& info) { s.text2b(info.name); s.value4b(info.programListId); } + +template +void serialize(S& s, ProgramListInfo& info) { + s.value4b(info.id); + s.text2b(info.name); + s.value4b(info.programCount); +} } // namespace Vst } // namespace Steinberg diff --git a/src/plugin/bridges/vst3-impls/plugin-proxy.cpp b/src/plugin/bridges/vst3-impls/plugin-proxy.cpp index 629bd400..7c182ad5 100644 --- a/src/plugin/bridges/vst3-impls/plugin-proxy.cpp +++ b/src/plugin/bridges/vst3-impls/plugin-proxy.cpp @@ -465,9 +465,13 @@ int32 PLUGIN_API Vst3PluginProxyImpl::getProgramListCount() { tresult PLUGIN_API Vst3PluginProxyImpl::getProgramListInfo( int32 listIndex, Steinberg::Vst::ProgramListInfo& info /*out*/) { - // TODO: Implement - bridge.logger.log("TODO: IUnitInfo::getProgramListInfo()"); - return Steinberg::kNotImplemented; + const GetProgramListInfoResponse response = + bridge.send_message(YaUnitInfo::GetProgramListInfo{ + .instance_id = instance_id(), .list_index = listIndex}); + + info = response.info; + + return response.result; } tresult PLUGIN_API diff --git a/src/wine-host/bridges/vst3.cpp b/src/wine-host/bridges/vst3.cpp index bbf1f1f4..66ee170b 100644 --- a/src/wine-host/bridges/vst3.cpp +++ b/src/wine-host/bridges/vst3.cpp @@ -586,6 +586,16 @@ void Vst3Bridge::run() { return object_instances[request.instance_id] .unit_info->getProgramListCount(); }, + [&](const YaUnitInfo::GetProgramListInfo& request) + -> YaUnitInfo::GetProgramListInfo::Response { + Steinberg::Vst::ProgramListInfo info; + const tresult result = object_instances[request.instance_id] + .unit_info->getProgramListInfo( + request.list_index, info); + + return YaUnitInfo::GetProgramListInfoResponse{.result = result, + .info = info}; + }, }); }