Use the univeral tresult in IComponent creation

This commit is contained in:
Robbert van der Helm
2020-12-11 23:54:30 +01:00
parent 91a47a466c
commit e24cecc6d7
7 changed files with 49 additions and 28 deletions
+11 -6
View File
@@ -56,13 +56,18 @@ void Vst3Logger::log_response(bool is_host_vst, const Ack&) {
void Vst3Logger::log_response(
bool is_host_vst,
const std::optional<YaComponent::CreateArgs>& args) {
const std::variant<YaComponent::CreateArgs, UniversalTResult>& result) {
log_response_base(is_host_vst, [&](auto& message) {
if (args) {
message << "<IComponent* #" << args->instance_id << ">";
} else {
message << "<nullptr>";
}
std::visit(overload{[&](const YaComponent::CreateArgs& args) {
message << "<IComponent* #" << args.instance_id
<< ">";
},
[&](const UniversalTResult& code) {
// TODO: Add a `UniversalTResult::string()` for
// the human readable representation
message << code.native();
}},
result);
});
}
+3 -2
View File
@@ -53,8 +53,9 @@ class Vst3Logger {
void log_request(bool is_host_vst, const WantsPluginFactory&);
void log_response(bool is_host_vst, const Ack&);
void log_response(bool is_host_vst,
const std::optional<YaComponent::CreateArgs>&);
void log_response(
bool is_host_vst,
const std::variant<YaComponent::CreateArgs, UniversalTResult>&);
void log_response(bool is_host_vst, const Configuration&);
void log_response(bool is_host_vst, const YaPluginFactory&);
+3 -3
View File
@@ -16,10 +16,10 @@
#include "base.h"
UniversalTResult::UniversalTResult() : universal_result(Value::kResultFalse) {}
UniversalTResult::UniversalTResult(tresult native_result)
: universal_result(to_universal_result(native_result)) {
//
}
: universal_result(to_universal_result(native_result)) {}
tresult UniversalTResult::native() const {
static_assert(Steinberg::kResultOk == Steinberg::kResultTrue);
+9
View File
@@ -52,6 +52,15 @@ struct Ack {
*/
class UniversalTResult {
public:
/**
* The default constructor will initialize the value to `kResutlFalse` and
* should only ever be used by bitsery in the serialization process.
*/
UniversalTResult();
/**
* Convert a native tresult into a univeral one.
*/
UniversalTResult(tresult native_result);
/**
+10 -7
View File
@@ -17,9 +17,11 @@
#pragma once
#include <optional>
#include <variant>
#include <bitsery/ext/pointer.h>
#include <bitsery/ext/std_optional.h>
#include <bitsery/ext/std_variant.h>
#include <bitsery/traits/array.h>
#include <pluginterfaces/vst/ivstcomponent.h>
@@ -82,8 +84,7 @@ class YaComponent : public Steinberg::Vst::IComponent {
* ...)`.
*/
struct Create {
// TODO: Create a `native_tvalue` wrapper, and then also add them here
using Response = std::optional<CreateArgs>;
using Response = std::variant<CreateArgs, UniversalTResult>;
ArrayUID cid;
@@ -156,9 +157,11 @@ class YaComponent : public Steinberg::Vst::IComponent {
CreateArgs arguments;
};
template <typename S>
void serialize(S& s, std::optional<YaComponent::CreateArgs>& args) {
s.ext(args, bitsery::ext::StdOptional{});
}
#pragma GCC diagnostic pop
template <typename S>
void serialize(
S& s,
std::variant<YaComponent::CreateArgs, UniversalTResult>& result) {
s.ext(result, bitsery::ext::StdVariant{});
}