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

Use the new simple supports flags for the factory

Browse Source 
This is both more type safe and as it turns out much more manageable.
This commit is contained in:
Robbert van der Helm
2020-12-17 13:20:16 +01:00
parent 655195a415
commit 481975860c
3 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/serialization/vst3/plugin-factory.cpp
+6 -9
View File
@@ -25,7 +25,6 @@ YaPluginFactory::ConstructArgs::ConstructArgs() {}
YaPluginFactory::ConstructArgs::ConstructArgs(
Steinberg::IPtr<Steinberg::IPluginFactory> factory) {
known_iids.insert(factory->iid);
// `IPluginFactory::getFactoryInfo`
if (Steinberg::PFactoryInfo info;
factory->getFactoryInfo(&info) == Steinberg::kResultOk) {
@@ -47,7 +46,7 @@ YaPluginFactory::ConstructArgs::ConstructArgs(
return;
}
known_iids.insert(factory2->iid);
supports_plugin_factory_2 = true;
// `IpluginFactory2::getClassInfo2`
class_infos_2.resize(num_classes);
for (int i = 0; i < num_classes; i++) {
@@ -62,7 +61,7 @@ YaPluginFactory::ConstructArgs::ConstructArgs(
return;
}
known_iids.insert(factory3->iid);
supports_plugin_factory_3 = true;
// `IpluginFactory3::getClassInfoUnicode`
class_infos_unicode.resize(num_classes);
for (int i = 0; i < num_classes; i++) {
@@ -90,15 +89,13 @@ tresult PLUGIN_API YaPluginFactory::queryInterface(Steinberg::FIDString _iid,
void** obj) {
QUERY_INTERFACE(_iid, obj, Steinberg::FUnknown::iid,
Steinberg::IPluginFactory)
if (arguments.known_iids.contains(Steinberg::IPluginFactory::iid)) {
QUERY_INTERFACE(_iid, obj, Steinberg::IPluginFactory::iid,
Steinberg::IPluginFactory)
}
if (arguments.known_iids.contains(Steinberg::IPluginFactory2::iid)) {
QUERY_INTERFACE(_iid, obj, Steinberg::IPluginFactory::iid,
Steinberg::IPluginFactory)
if (arguments.supports_plugin_factory_2) {
QUERY_INTERFACE(_iid, obj, Steinberg::IPluginFactory2::iid,
Steinberg::IPluginFactory2)
}
if (arguments.known_iids.contains(Steinberg::IPluginFactory3::iid)) {
if (arguments.supports_plugin_factory_3) {
QUERY_INTERFACE(_iid, obj, Steinberg::IPluginFactory3::iid,
Steinberg::IPluginFactory3)
}