diff --git a/meson.build b/meson.build index 0f7fb897..a6d08531 100644 --- a/meson.build +++ b/meson.build @@ -114,6 +114,7 @@ vst3_plugin_sources = [ 'src/common/serialization/vst3/component-handler/component-handler.cpp', 'src/common/serialization/vst3/component-handler/component-handler-2.cpp', 'src/common/serialization/vst3/component-handler/component-handler-3.cpp', + 'src/common/serialization/vst3/component-handler/component-handler-bus-activation.cpp', 'src/common/serialization/vst3/component-handler/unit-handler.cpp', 'src/common/serialization/vst3/component-handler/unit-handler-2.cpp', 'src/common/serialization/vst3/context-menu/context-menu.cpp', @@ -193,6 +194,7 @@ if with_vst3 'src/common/serialization/vst3/component-handler/component-handler.cpp', 'src/common/serialization/vst3/component-handler/component-handler-2.cpp', 'src/common/serialization/vst3/component-handler/component-handler-3.cpp', + 'src/common/serialization/vst3/component-handler/component-handler-bus-activation.cpp', 'src/common/serialization/vst3/component-handler/unit-handler.cpp', 'src/common/serialization/vst3/component-handler/unit-handler-2.cpp', 'src/common/serialization/vst3/context-menu/context-menu.cpp', diff --git a/src/common/serialization/vst3/README.md b/src/common/serialization/vst3/README.md index 1b30c3fe..fbbaf3fc 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.6 +- Interfaces introduced after VST 3.6.8 - The [Presonus extensions](https://presonussoftware.com/en_US/developer), although most of these things seem to overlap with newer VST3 interfaces @@ -42,20 +42,21 @@ VST3 plugin interfaces are implemented as follows: VST3 host interfaces are implemented as follows: -| yabridge class | Included in | Interfaces | -| --------------------------- | --------------------------- | -------------------- | -| `Vst3HostContextProxy` | | All of the below: | -| `YaHostApplication` | `Vst3HostContextProxy` | `IHostApplication` | -| `Vst3ComponentHandlerProxy` | | All of the below: | -| `YaComponentHandler` | `Vst3ComponentHandlerProxy` | `IComponentHandler` | -| `YaComponentHandler2` | `Vst3ComponentHandlerProxy` | `IComponentHandler2` | -| `YaComponentHandler3` | `Vst3ComponentHandlerProxy` | `IComponentHandler3` | -| `YaUnitHandler` | `Vst3ComponentHandlerProxy` | `IUnitHandler` | -| `YaUnitHandler2` | `Vst3ComponentHandlerProxy` | `IUnitHandler2` | -| `Vst3ContextMenuProxy` | | All of the below: | -| `YaContextMenu` | `Vst3ContextMenuProxy` | `IContextMenu` | -| `Vst3PlugFrameProxy` | | All of the below: | -| `YaPlugFrame` | `Vst3PlugFrameProxy` | `IPlugFrame` | +| yabridge class | Included in | Interfaces | +| --------------------------------- | --------------------------- | -------------------------------- | +| `Vst3HostContextProxy` | | All of the below: | +| `YaHostApplication` | `Vst3HostContextProxy` | `IHostApplication` | +| `Vst3ComponentHandlerProxy` | | All of the below: | +| `YaComponentHandler` | `Vst3ComponentHandlerProxy` | `IComponentHandler` | +| `YaComponentHandler2` | `Vst3ComponentHandlerProxy` | `IComponentHandler2` | +| `YaComponentHandler3` | `Vst3ComponentHandlerProxy` | `IComponentHandler3` | +| `YaComponentHandlerBusActivation` | `Vst3ComponentHandlerProxy` | `IComponentHandlerBusActivation` | +| `YaUnitHandler` | `Vst3ComponentHandlerProxy` | `IUnitHandler` | +| `YaUnitHandler2` | `Vst3ComponentHandlerProxy` | `IUnitHandler2` | +| `Vst3ContextMenuProxy` | | All of the below: | +| `YaContextMenu` | `Vst3ContextMenuProxy` | `IContextMenu` | +| `Vst3PlugFrameProxy` | | All of the below: | +| `YaPlugFrame` | `Vst3PlugFrameProxy` | `IPlugFrame` | The following host interfaces are passed as function arguments and are thus also implemented for serialization purposes: diff --git a/src/common/serialization/vst3/component-handler/component-handler-bus-activation.cpp b/src/common/serialization/vst3/component-handler/component-handler-bus-activation.cpp new file mode 100644 index 00000000..ac6f3480 --- /dev/null +++ b/src/common/serialization/vst3/component-handler/component-handler-bus-activation.cpp @@ -0,0 +1,28 @@ +// 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 "component-handler-bus-activation.h" + +YaComponentHandlerBusActivation::ConstructArgs::ConstructArgs() {} + +YaComponentHandlerBusActivation::ConstructArgs::ConstructArgs( + Steinberg::IPtr object) + : supported(Steinberg::FUnknownPtr< + Steinberg::Vst::IComponentHandlerBusActivation>(object)) {} + +YaComponentHandlerBusActivation::YaComponentHandlerBusActivation( + const ConstructArgs&& args) + : arguments(std::move(args)) {} diff --git a/src/common/serialization/vst3/component-handler/component-handler-bus-activation.h b/src/common/serialization/vst3/component-handler/component-handler-bus-activation.h new file mode 100644 index 00000000..7047d843 --- /dev/null +++ b/src/common/serialization/vst3/component-handler/component-handler-bus-activation.h @@ -0,0 +1,77 @@ +// 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 "bitsery/ext/std_optional.h" + +#include "../../common.h" +#include "../base.h" +#include "../context-menu-proxy.h" + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" + +/** + * Wraps around `IComponentHandlerBusActivation` for serialization purposes. + * This is instantiated as part of `Vst3ComponentHandlerBusActivationProxy`. + */ +class YaComponentHandlerBusActivation + : public Steinberg::Vst::IComponentHandlerBusActivation { + public: + /** + * These are the arguments for creating a `YaComponentHandlerBusActivation`. + */ + struct ConstructArgs { + ConstructArgs(); + + /** + * Check whether an existing implementation implements + * `IComponentHandlerBusActivation` 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. + */ + YaComponentHandlerBusActivation(const ConstructArgs&& args); + + inline bool supported() const { return arguments.supported; } + + virtual tresult PLUGIN_API + requestBusActivation(Steinberg::Vst::MediaType type, + Steinberg::Vst::BusDirection dir, + int32 index, + TBool state) override = 0; + + protected: + ConstructArgs arguments; +}; + +#pragma GCC diagnostic pop