diff --git a/src/common/logging/vst3.cpp b/src/common/logging/vst3.cpp index 40c3959e..8f05a45a 100644 --- a/src/common/logging/vst3.cpp +++ b/src/common/logging/vst3.cpp @@ -1417,7 +1417,7 @@ void Vst3Logger::log_response( message << response.result.string(); if (response.result == Steinberg::kResultOk) { std::string param_title = - VST3::StringConvert::convert(response.updated_info.title); + VST3::StringConvert::convert(response.info.title); message << ", "; if (from_cache) { message << " (from cache)"; diff --git a/src/common/serialization/vst3/plugin/edit-controller.h b/src/common/serialization/vst3/plugin/edit-controller.h index 0bc0ee46..628766ed 100644 --- a/src/common/serialization/vst3/plugin/edit-controller.h +++ b/src/common/serialization/vst3/plugin/edit-controller.h @@ -118,12 +118,12 @@ class YaEditController : public Steinberg::Vst::IEditController { */ struct GetParameterInfoResponse { UniversalTResult result; - Steinberg::Vst::ParameterInfo updated_info; + Steinberg::Vst::ParameterInfo info; template void serialize(S& s) { s.object(result); - s.object(updated_info); + s.object(info); } }; @@ -138,13 +138,11 @@ class YaEditController : public Steinberg::Vst::IEditController { native_size_t instance_id; int32 param_index; - Steinberg::Vst::ParameterInfo info; template void serialize(S& s) { s.value8b(instance_id); s.value4b(param_index); - s.object(info); } }; diff --git a/src/plugin/bridges/vst3-impls/plugin-proxy.cpp b/src/plugin/bridges/vst3-impls/plugin-proxy.cpp index 30481880..77c0bfe0 100644 --- a/src/plugin/bridges/vst3-impls/plugin-proxy.cpp +++ b/src/plugin/bridges/vst3-impls/plugin-proxy.cpp @@ -490,7 +490,7 @@ tresult PLUGIN_API Vst3PluginProxyImpl::getParameterInfo( int32 paramIndex, Steinberg::Vst::ParameterInfo& info /*out*/) { const auto request = YaEditController::GetParameterInfo{ - .instance_id = instance_id(), .param_index = paramIndex, .info = info}; + .instance_id = instance_id(), .param_index = paramIndex}; // We'll cache this information to work around an issue in REAPER, see // `parameter_info_cache` @@ -503,8 +503,7 @@ tresult PLUGIN_API Vst3PluginProxyImpl::getParameterInfo( bridge.logger.log_response( true, YaEditController::GetParameterInfo::Response{ - .result = Steinberg::kResultOk, - .updated_info = it->second}, + .result = Steinberg::kResultOk, .info = it->second}, true); } @@ -516,11 +515,11 @@ tresult PLUGIN_API Vst3PluginProxyImpl::getParameterInfo( const GetParameterInfoResponse response = bridge.send_message(request); - info = response.updated_info; + info = response.info; { std::lock_guard lock(parameter_info_cache_mutex); - parameter_info_cache.parameter_info[paramIndex] = response.updated_info; + parameter_info_cache.parameter_info[paramIndex] = response.info; } return response.result; diff --git a/src/wine-host/bridges/vst3.cpp b/src/wine-host/bridges/vst3.cpp index 9112dfd0..b8073f1b 100644 --- a/src/wine-host/bridges/vst3.cpp +++ b/src/wine-host/bridges/vst3.cpp @@ -327,13 +327,13 @@ void Vst3Bridge::run() { }, [&](YaEditController::GetParameterInfo& request) -> YaEditController::GetParameterInfo::Response { - const tresult result = - object_instances[request.instance_id] - .edit_controller->getParameterInfo(request.param_index, - request.info); + Steinberg::Vst::ParameterInfo info{}; + const tresult result = object_instances[request.instance_id] + .edit_controller->getParameterInfo( + request.param_index, info); return YaEditController::GetParameterInfoResponse{ - .result = result, .updated_info = std::move(request.info)}; + .result = result, .info = std::move(info)}; }, [&](const YaEditController::GetParamStringByValue& request) -> YaEditController::GetParamStringByValue::Response {