diff --git a/meson.build b/meson.build index 1168b4c5..34c88444 100644 --- a/meson.build +++ b/meson.build @@ -119,6 +119,7 @@ vst3_plugin_sources = [ 'src/common/serialization/vst3/component-handler/unit-handler-2.cpp', 'src/common/serialization/vst3/context-menu/context-menu.cpp', 'src/common/serialization/vst3/host-context/host-application.cpp', + 'src/common/serialization/vst3/host-context/plug-interface-support.cpp', 'src/common/serialization/vst3/plug-view/parameter-finder.cpp', 'src/common/serialization/vst3/plug-view/plug-view.cpp', 'src/common/serialization/vst3/plug-view/plug-view-content-scale-support.cpp', @@ -202,6 +203,7 @@ if with_vst3 'src/common/serialization/vst3/component-handler/unit-handler-2.cpp', 'src/common/serialization/vst3/context-menu/context-menu.cpp', 'src/common/serialization/vst3/host-context/host-application.cpp', + 'src/common/serialization/vst3/host-context/plug-interface-support.cpp', 'src/common/serialization/vst3/plug-view/parameter-finder.cpp', 'src/common/serialization/vst3/plug-view/plug-view.cpp', 'src/common/serialization/vst3/plug-view/plug-view-content-scale-support.cpp', diff --git a/src/common/serialization/vst3/README.md b/src/common/serialization/vst3/README.md index 42e7e3d5..db951986 100644 --- a/src/common/serialization/vst3/README.md +++ b/src/common/serialization/vst3/README.md @@ -6,7 +6,7 @@ for more information on how the serialization works. The following interfaces are not yet implemented: -- Interfaces introduced after VST 3.6.11 +- Interfaces introduced after VST 3.6.12 - The [Presonus extensions](https://presonussoftware.com/en_US/developer), although most of these things seem to overlap with newer VST3 interfaces @@ -48,6 +48,7 @@ VST3 host interfaces are implemented as follows: | --------------------------------- | --------------------------- | -------------------------------- | | `Vst3HostContextProxy` | | All of the below: | | `YaHostApplication` | `Vst3HostContextProxy` | `IHostApplication` | +| `YaPlugInterfaceSupport` | `Vst3HostContextProxy` | `IPlugInterfaceSupport` | | `Vst3ComponentHandlerProxy` | | All of the below: | | `YaComponentHandler` | `Vst3ComponentHandlerProxy` | `IComponentHandler` | | `YaComponentHandler2` | `Vst3ComponentHandlerProxy` | `IComponentHandler2` | diff --git a/src/common/serialization/vst3/host-context/host-application.h b/src/common/serialization/vst3/host-context/host-application.h index bbb06d41..84556516 100644 --- a/src/common/serialization/vst3/host-context/host-application.h +++ b/src/common/serialization/vst3/host-context/host-application.h @@ -105,6 +105,10 @@ class YaHostApplication : public Steinberg::Vst::IHostApplication { virtual tresult PLUGIN_API getName(Steinberg::Vst::String128 name) override = 0; + + // We don't have to (and can't) pass this through. This is only used to + // create `IMessage` and `IAttributeList` objects that the plugin can use to + // pass messages between the processor and the controller objects. virtual tresult PLUGIN_API createInstance(Steinberg::TUID cid, Steinberg::TUID _iid, void** obj) override = 0; diff --git a/src/common/serialization/vst3/host-context/plug-interface-support.cpp b/src/common/serialization/vst3/host-context/plug-interface-support.cpp new file mode 100644 index 00000000..c0222b91 --- /dev/null +++ b/src/common/serialization/vst3/host-context/plug-interface-support.cpp @@ -0,0 +1,27 @@ +// yabridge: a Wine VST bridge +// Copyright (C) 2020-2021 Robbert van der Helm +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +#include "plug-interface-support.h" + +YaPlugInterfaceSupport::ConstructArgs::ConstructArgs() {} + +YaPlugInterfaceSupport::ConstructArgs::ConstructArgs( + Steinberg::IPtr object) + : supported(Steinberg::FUnknownPtr( + object)) {} + +YaPlugInterfaceSupport::YaPlugInterfaceSupport(const ConstructArgs&& args) + : arguments(std::move(args)) {} diff --git a/src/common/serialization/vst3/host-context/plug-interface-support.h b/src/common/serialization/vst3/host-context/plug-interface-support.h new file mode 100644 index 00000000..117c13f5 --- /dev/null +++ b/src/common/serialization/vst3/host-context/plug-interface-support.h @@ -0,0 +1,71 @@ +// yabridge: a Wine VST bridge +// Copyright (C) 2020-2021 Robbert van der Helm +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +#pragma once + +#include + +#include "../../common.h" +#include "../base.h" + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" + +/** + * Wraps around `IPlugInterfaceSupport` for serialization purposes. This is + * instantiated as part of `Vst3HostContextProxy`. + */ +class YaPlugInterfaceSupport : public Steinberg::Vst::IPlugInterfaceSupport { + public: + /** + * These are the arguments for creating a `YaPlugInterfaceSupport`. + */ + struct ConstructArgs { + ConstructArgs(); + + /** + * Check whether an existing implementation implements + * `IPlugInterfaceSupport` and read arguments from it. + */ + ConstructArgs(Steinberg::IPtr object); + + /** + * Whether the object supported this interface. + */ + bool supported; + + template + void serialize(S& s) { + s.value1b(supported); + } + }; + + /** + * Instantiate this instance with arguments read from another interface + * implementation. + */ + YaPlugInterfaceSupport(const ConstructArgs&& args); + + inline bool supported() const { return arguments.supported; } + + virtual tresult PLUGIN_API + isPlugInterfaceSupported(const Steinberg::TUID _iid) override = 0; + + protected: + ConstructArgs arguments; +}; + +#pragma GCC diagnostic pop