From 19fd99b58e88f1f933ccb820dca80bbc079ae9e3 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Sun, 24 Jan 2021 16:55:11 +0100 Subject: [PATCH] Get rid of old fixmes related to the CID migration --- src/common/serialization/vst3/base.h | 3 --- src/common/serialization/vst3/plugin-factory.cpp | 13 ++++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/common/serialization/vst3/base.h b/src/common/serialization/vst3/base.h index 29ac861b..23e2620b 100644 --- a/src/common/serialization/vst3/base.h +++ b/src/common/serialization/vst3/base.h @@ -82,9 +82,6 @@ struct Ack { * Both `TUID` (`int8_t[16]`) and `FIDString` (`char*`) are hard to work with * because you can't just copy them. So when serializing/deserializing them * we'll use `std::array`. - * - * FIXME: Replace usages of ArrayUID everywhere with either `WineUID` or - * `NativeUID` */ using ArrayUID = std::array< std::remove_reference_t()[0])>, diff --git a/src/common/serialization/vst3/plugin-factory.cpp b/src/common/serialization/vst3/plugin-factory.cpp index 2ef3f34e..ceb7c606 100644 --- a/src/common/serialization/vst3/plugin-factory.cpp +++ b/src/common/serialization/vst3/plugin-factory.cpp @@ -145,13 +145,8 @@ tresult PLUGIN_API YaPluginFactory::getClassInfo(Steinberg::int32 index, return Steinberg::kInvalidArgument; } - // FIXME: The class IDs are incorrect! See the `INLINE_UID` macro. We need - // to shuffle the byte orders around for plugins to be compatible - // with projects saved under Windows and with native Linux versions - // of the same plugin. We need to do this transformation for all of - // these functions - // FIXME: We need to do similar translations everywhere where we encounter - // `ArrayUID`, such as `IComponent::getControllerClassId()` + // We will have already converted these class IDs to the native + // representation in `YaPluginFactory::ConstructArgs` if (arguments.class_infos_1[index]) { *info = *arguments.class_infos_1[index]; return Steinberg::kResultOk; @@ -166,6 +161,8 @@ YaPluginFactory::getClassInfo2(int32 index, Steinberg::PClassInfo2* info) { return Steinberg::kInvalidArgument; } + // We will have already converted these class IDs to the native + // representation in `YaPluginFactory::ConstructArgs` if (arguments.class_infos_2[index]) { *info = *arguments.class_infos_2[index]; return Steinberg::kResultOk; @@ -181,6 +178,8 @@ YaPluginFactory::getClassInfoUnicode(int32 index, return Steinberg::kInvalidArgument; } + // We will have already converted these class IDs to the native + // representation in `YaPluginFactory::ConstructArgs` if (arguments.class_infos_unicode[index]) { *info = *arguments.class_infos_unicode[index]; return Steinberg::kResultOk;