vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-14 04:19:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Unify handling for *::{get,set}State

Browse Source 
Since these functions are exactly the same, and for whatever reason they
didn't just add them to the `IPluginBase` both `IComponent` and
`IEditController`. inherit from
This commit is contained in:
Robbert van der Helm
2020-12-17 17:52:51 +01:00
parent d8694b062b
commit fe2de8de8d
9 changed files with 136 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/logging/vst3.cpp
+29 -28
View File
@@ -60,6 +60,23 @@ void Vst3Logger::log_request(bool is_host_vst,
});
}
void Vst3Logger::log_request(bool is_host_vst,
const Vst3PluginProxy::SetState& request) {
log_request_base(is_host_vst, [&](auto& message) {
message << "<{IComponent,IEditController}* #" << request.instance_id
<< ">::setState(state = <IBStream* containing "
<< request.state.size() << "bytes>)";
});
}
void Vst3Logger::log_request(bool is_host_vst,
const Vst3PluginProxy::GetState& request) {
log_request_base(is_host_vst, [&](auto& message) {
message << "<{IComponent,IEditController}* #" << request.instance_id
<< ">::getState(state = <IBStream*>)";
});
}
void Vst3Logger::log_request(
bool is_host_vst,
const YaAudioProcessor::SetBusArrangements& request) {
@@ -247,23 +264,6 @@ void Vst3Logger::log_request(bool is_host_vst,
});
}
void Vst3Logger::log_request(bool is_host_vst,
const YaComponent::SetState& request) {
log_request_base(is_host_vst, [&](auto& message) {
message << "<IComponent* #" << request.instance_id
<< ">::setState(state = <IBStream* containing "
<< request.state.size() << "bytes>)";
});
}
void Vst3Logger::log_request(bool is_host_vst,
const YaComponent::GetState& request) {
log_request_base(is_host_vst, [&](auto& message) {
message << "<IComponent* #" << request.instance_id
<< ">::getState(state = <IBStream*>)";
});
}
void Vst3Logger::log_request(bool is_host_vst,
const YaPluginBase::Initialize& request) {
log_request_base(is_host_vst, [&](auto& message) {
@@ -323,6 +323,18 @@ void Vst3Logger::log_response(bool is_host_vst,
});
}
void Vst3Logger::log_response(
bool is_host_vst,
const Vst3PluginProxy::GetStateResponse& response) {
log_response_base(is_host_vst, [&](auto& message) {
message << response.result.string();
if (response.result == Steinberg::kResultOk) {
message << ", <IBStream* containing "
<< response.updated_state.size() << " bytes>";
}
});
}
void Vst3Logger::log_response(
bool is_host_vst,
const YaAudioProcessor::GetBusArrangementResponse& response) {
@@ -403,17 +415,6 @@ void Vst3Logger::log_response(
});
}
void Vst3Logger::log_response(bool is_host_vst,
const YaComponent::GetStateResponse& response) {
log_response_base(is_host_vst, [&](auto& message) {
message << response.result.string();
if (response.result == Steinberg::kResultOk) {
message << ", <IBStream* containing "
<< response.updated_state.size() << " bytes>";
}
});
}
void Vst3Logger::log_response(bool is_host_vst,
const YaPluginFactory::ConstructArgs& args) {
log_response_base(is_host_vst, [&](auto& message) {
src/common/logging/vst3.h
+4 -3
View File
@@ -58,6 +58,8 @@ class Vst3Logger {
void log_request(bool is_host_vst, const Vst3PluginProxy::Construct&);
void log_request(bool is_host_vst, const Vst3PluginProxy::Destruct&);
void log_request(bool is_host_vst, const Vst3PluginProxy::SetState&);
void log_request(bool is_host_vst, const Vst3PluginProxy::GetState&);
void log_request(bool is_host_vst,
const YaAudioProcessor::SetBusArrangements&);
void log_request(bool is_host_vst,
@@ -77,8 +79,6 @@ 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 YaComponent::SetState&);
void log_request(bool is_host_vst, const YaComponent::GetState&);
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&);
@@ -89,6 +89,8 @@ class Vst3Logger {
void log_response(
bool is_host_vst,
const std::variant<Vst3PluginProxy::ConstructArgs, UniversalTResult>&);
void log_response(bool is_host_vst,
const Vst3PluginProxy::GetStateResponse&);
void log_response(bool is_host_vst,
const YaAudioProcessor::GetBusArrangementResponse&);
void log_response(bool is_host_vst,
@@ -96,7 +98,6 @@ class Vst3Logger {
void log_response(bool is_host_vst, const YaComponent::GetBusInfoResponse&);
void log_response(bool is_host_vst,
const YaComponent::GetRoutingInfoResponse&);
void log_response(bool is_host_vst, const YaComponent::GetStateResponse&);
void log_response(bool is_host_vst, const YaPluginFactory::ConstructArgs&);
void log_response(bool is_host_vst, const Configuration&);
src/common/serialization/vst3.h
+2 -2
View File
@@ -59,6 +59,8 @@ struct WantsConfiguration {
*/
using ControlRequest = std::variant<Vst3PluginProxy::Construct,
Vst3PluginProxy::Destruct,
Vst3PluginProxy::SetState,
Vst3PluginProxy::GetState,
YaAudioProcessor::SetBusArrangements,
YaAudioProcessor::GetBusArrangement,
YaAudioProcessor::CanProcessSampleSize,
@@ -73,8 +75,6 @@ using ControlRequest = std::variant<Vst3PluginProxy::Construct,
YaComponent::GetRoutingInfo,
YaComponent::ActivateBus,
YaComponent::SetActive,
YaComponent::SetState,
YaComponent::GetState,
YaPluginBase::Initialize,
YaPluginBase::Terminate,
YaPluginFactory::Construct,
src/common/serialization/vst3/plugin-proxy.h
+52
View File
@@ -150,6 +150,58 @@ class Vst3PluginProxy : public YaAudioProcessor,
DECLARE_FUNKNOWN_METHODS
// We'll define messages for functions that have identical definitions in
// multiple interfaces below. When the Wine plugin host process handles
// these it should check which of the interfaces is supported on the host.
/**
* Message to pass through a call to
* `{IComponent,IEditController}::setState(state)` to the Wine plugin host.
*/
struct SetState {
using Response = UniversalTResult;
native_size_t instance_id;
VectorStream state;
template <typename S>
void serialize(S& s) {
s.value8b(instance_id);
s.object(state);
}
};
/**
* The response code and written state for a call to
* `{IComponent,IEditController}::getState(state)`.
*/
struct GetStateResponse {
UniversalTResult result;
VectorStream updated_state;
template <typename S>
void serialize(S& s) {
s.object(result);
s.object(updated_state);
}
};
/**
* Message to pass through a call to
* `{IComponent,IEditController}::getState(state)` to the Wine plugin host.
*/
struct GetState {
using Response = GetStateResponse;
native_size_t instance_id;
template <typename S>
void serialize(S& s) {
s.value8b(instance_id);
}
};
protected:
ConstructArgs arguments;
};
src/common/serialization/vst3/plugin/component.h
+4 -49
View File
@@ -255,57 +255,12 @@ class YaComponent : public Steinberg::Vst::IComponent {
virtual tresult PLUGIN_API setActive(TBool state) override = 0;
/**
* Message to pass through a call to `IComponent::setState(state)` to the
* Wine plugin host.
*/
struct SetState {
using Response = UniversalTResult;
native_size_t instance_id;
VectorStream state;
template <typename S>
void serialize(S& s) {
s.value8b(instance_id);
s.object(state);
}
};
// `setState()` and `getState()` are defiend in both `IComponent` and
// `IEditController`. Since an object can only ever implement one or the
// other, the messages for calling either are defined directly on
// `Vst3PluginProxy`.
virtual tresult PLUGIN_API
setState(Steinberg::IBStream* state) override = 0;
/**
* The response code and written state for a call to
* `IComponent::getState(state)`.
*/
struct GetStateResponse {
UniversalTResult result;
VectorStream updated_state;
template <typename S>
void serialize(S& s) {
s.object(result);
s.object(updated_state);
}
};
/**
* Message to pass through a call to `IComponent::getState(state)` to the
* Wine plugin host.
*/
struct GetState {
using Response = GetStateResponse;
native_size_t instance_id;
template <typename S>
void serialize(S& s) {
s.value8b(instance_id);
}
};
virtual tresult PLUGIN_API
getState(Steinberg::IBStream* state) override = 0;
src/common/serialization/vst3/plugin/edit-controller.h
+6
View File
@@ -80,10 +80,16 @@ class YaEditController2 : public Steinberg::Vst::IEditController,
virtual tresult PLUGIN_API
setComponentState(Steinberg::IBStream* state) override = 0;
// `setState()` and `getState()` are defiend in both `IComponent` and
// `IEditController`. Since an object can only ever implement one or the
// other, the messages for calling either are defined directly on
// `Vst3PluginProxy`.
virtual tresult PLUGIN_API
setState(Steinberg::IBStream* state) override = 0;
virtual tresult PLUGIN_API
getState(Steinberg::IBStream* state) override = 0;
virtual int32 PLUGIN_API getParameterCount() override = 0;
virtual tresult PLUGIN_API
getParameterInfo(int32 paramIndex,