vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-06-20 11:02:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the query interface serialization

Browse Source
This commit is contained in:
Robbert van der Helm
2020-12-05 12:05:13 +01:00
parent 42f3639e93
commit 8f152c7af5
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/configuration.h
+1 -1
View File
@@ -138,7 +138,7 @@ class Configuration {
s.ext(group, bitsery::ext::StdOptional(), s.ext(group, bitsery::ext::StdOptional(),
[](S& s, auto& v) { s.text1b(v, 4096); }); [](S& s, auto& v) { s.text1b(v, 4096); });
s.ext(matched_file, bitsery::ext::StdOptional(), s.ext(matched_file, bitsery::ext::StdOptional(),
[](S& s, auto& v) { s.ext(v, bitsery::ext::BoostPath()); }); [](S& s, auto& v) { s.ext(v, bitsery::ext::BoostPath{}); });
s.ext(matched_pattern, bitsery::ext::StdOptional(), s.ext(matched_pattern, bitsery::ext::StdOptional(),
[](S& s, auto& v) { s.text1b(v, 4096); }); [](S& s, auto& v) { s.text1b(v, 4096); });
src/common/serialization/vst3/plugin-factory.cpp
+6 -5
View File
@@ -37,14 +37,15 @@ tresult PLUGIN_API YaPluginFactory::queryInterface(Steinberg::FIDString _iid,
void** obj) { void** obj) {
QUERY_INTERFACE(_iid, obj, Steinberg::FUnknown::iid, QUERY_INTERFACE(_iid, obj, Steinberg::FUnknown::iid,
Steinberg::IPluginFactory) Steinberg::IPluginFactory)
QUERY_INTERFACE(_iid, obj, Steinberg::IPluginFactory::iid, if (known_iids.contains(Steinberg::IPluginFactory::iid)) {
Steinberg::IPluginFactory) QUERY_INTERFACE(_iid, obj, Steinberg::IPluginFactory::iid,
if (actual_iid == Steinberg::IPluginFactory2::iid || Steinberg::IPluginFactory)
actual_iid == Steinberg::IPluginFactory3::iid) { }
if (known_iids.contains(Steinberg::IPluginFactory2::iid)) {
QUERY_INTERFACE(_iid, obj, Steinberg::IPluginFactory2::iid, QUERY_INTERFACE(_iid, obj, Steinberg::IPluginFactory2::iid,
Steinberg::IPluginFactory2) Steinberg::IPluginFactory2)
} }
if (actual_iid == Steinberg::IPluginFactory3::iid) { if (known_iids.contains(Steinberg::IPluginFactory3::iid)) {
QUERY_INTERFACE(_iid, obj, Steinberg::IPluginFactory3::iid, QUERY_INTERFACE(_iid, obj, Steinberg::IPluginFactory3::iid,
Steinberg::IPluginFactory3) Steinberg::IPluginFactory3)
} }
src/common/serialization/vst3/plugin-factory.h
+9 -3
View File
@@ -16,6 +16,9 @@
#pragma once #pragma once
#include <set>
#include <bitsery/ext/std_set.h>
#include <pluginterfaces/base/ipluginbase.h> #include <pluginterfaces/base/ipluginbase.h>
#include "../../bitsery/ext/vst3.h" #include "../../bitsery/ext/vst3.h"
@@ -68,13 +71,16 @@ class YaPluginFactory : public Steinberg::IPluginFactory3 {
tresult PLUGIN_API setHostContext(Steinberg::FUnknown* context) override; tresult PLUGIN_API setHostContext(Steinberg::FUnknown* context) override;
/** /**
* The IID of the interface we should report as. * The IIDs that the interface we serialized supports.
*/ */
Steinberg::FUID actual_iid; std::set<Steinberg::FUID> known_iids;
template <typename S> template <typename S>
void serialize(S& s) { void serialize(S& s) {
s.ext(actual_iid, bitsery::ext::FUID()); s.ext(known_iids, bitsery::ext::StdSet{32},
[](S& s, Steinberg::FUID& iid) {
s.ext(iid, bitsery::ext::FUID{});
});
} }
}; };