diff --git a/meson.build b/meson.build index 81aaa8bb..e67a914e 100644 --- a/meson.build +++ b/meson.build @@ -97,6 +97,7 @@ vst3_plugin_sources = [ 'src/common/communication/common.cpp', 'src/common/logging/common.cpp', 'src/common/logging/vst3.cpp', + 'src/common/serialization/vst3/plug-view/parameter-finder.cpp', 'src/common/serialization/vst3/plug-view/plug-view.cpp', 'src/common/serialization/vst3/plug-frame/plug-frame.cpp', 'src/common/serialization/vst3/plugin/audio-processor.cpp', @@ -159,6 +160,7 @@ host_sources = [ if with_vst3 host_sources += [ 'src/common/logging/vst3.cpp', + 'src/common/serialization/vst3/plug-view/parameter-finder.cpp', 'src/common/serialization/vst3/plug-view/plug-view.cpp', 'src/common/serialization/vst3/plug-frame/plug-frame.cpp', 'src/common/serialization/vst3/plugin/audio-processor.cpp', diff --git a/src/common/serialization/vst3/README.md b/src/common/serialization/vst3/README.md index 0befc438..391d94f5 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: -- Every interface introduced after VST 3.0.1 with the exceptons of +- Every interface introduced after VST 3.0.2 with the exceptons of `IEditController2` and `INoteExpressionController` which has already been implemented - The [Presonus extensions](https://presonussoftware.com/en_US/developer), @@ -19,6 +19,7 @@ VST3 plugin interfaces are implemented as follows: | `YaPluginFactory` | | `IPluginFactory`, `IPluginFactory2`, `IPluginFactory3` | | `Vst3ConnectionPointProxy` | | `IConnectionPoint` through `YaConnectionPoint` | | `Vst3PlugViewProxy` | | All of the below: | +| `YaParameterFinder` | `Vst3PlugViewProxy` | `IParameterFinder` | | `YaPlugView` | `Vst3PlugViewProxy` | `IPlugView` | | `Vst3PluginProxy` | | All of the below: | | `YaAudioProcessor` | `Vst3PluginProxy` | `IAudioProcessor` | diff --git a/src/common/serialization/vst3/plug-view/parameter-finder.cpp b/src/common/serialization/vst3/plug-view/parameter-finder.cpp new file mode 100644 index 00000000..60f10264 --- /dev/null +++ b/src/common/serialization/vst3/plug-view/parameter-finder.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 "parameter-finder.h" + +YaParameterFinder::ConstructArgs::ConstructArgs() {} + +YaParameterFinder::ConstructArgs::ConstructArgs( + Steinberg::IPtr object) + : supported( + Steinberg::FUnknownPtr(object)) {} + +YaParameterFinder::YaParameterFinder(const ConstructArgs&& args) + : arguments(std::move(args)) {} diff --git a/src/common/serialization/vst3/plug-view/parameter-finder.h b/src/common/serialization/vst3/plug-view/parameter-finder.h new file mode 100644 index 00000000..a3b031a6 --- /dev/null +++ b/src/common/serialization/vst3/plug-view/parameter-finder.h @@ -0,0 +1,72 @@ +// 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 "../base.h" + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" + +/** + * Wraps around `IParameterFinder` for serialization purposes. This is + * instantiated as part of `Vst3ParameterFinderProxy`. + */ +class YaParameterFinder : public Steinberg::Vst::IParameterFinder { + public: + /** + * These are the arguments for creating a `YaParameterFinder`. + */ + struct ConstructArgs { + ConstructArgs(); + + /** + * Check whether an existing implementation implements + * `IParameterFinder` 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. + */ + YaParameterFinder(const ConstructArgs&& args); + + inline bool supported() const { return arguments.supported; } + + virtual tresult PLUGIN_API + findParameter(int32 xPos, + int32 yPos, + Steinberg::Vst::ParamID& resultTag /*out*/) = 0; + + protected: + ConstructArgs arguments; +}; + +#pragma GCC diagnostic pop diff --git a/src/common/serialization/vst3/plug-view/plug-view.h b/src/common/serialization/vst3/plug-view/plug-view.h index a964c0e0..ec94c0b2 100644 --- a/src/common/serialization/vst3/plug-view/plug-view.h +++ b/src/common/serialization/vst3/plug-view/plug-view.h @@ -18,7 +18,6 @@ #include -#include "../../common.h" #include "../base.h" #include "../plug-frame-proxy.h"