From be7fccc9207b13bce9980880d2e95caa144a83c9 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Fri, 15 Jan 2021 18:09:51 +0100 Subject: [PATCH] Add a proxy class for INoteExpressionPhysicalUIMapping --- meson.build | 2 + src/common/serialization/vst3/README.md | 55 +++++++------- .../note-expression-physical-ui-mapping.cpp | 28 +++++++ .../note-expression-physical-ui-mapping.h | 76 +++++++++++++++++++ 4 files changed, 134 insertions(+), 27 deletions(-) create mode 100644 src/common/serialization/vst3/plugin/note-expression-physical-ui-mapping.cpp create mode 100644 src/common/serialization/vst3/plugin/note-expression-physical-ui-mapping.h diff --git a/meson.build b/meson.build index 407cc8b6..25e1f7d7 100644 --- a/meson.build +++ b/meson.build @@ -135,6 +135,7 @@ vst3_plugin_sources = [ 'src/common/serialization/vst3/plugin/keyswitch-controller.cpp', 'src/common/serialization/vst3/plugin/midi-mapping.cpp', 'src/common/serialization/vst3/plugin/note-expression-controller.cpp', + 'src/common/serialization/vst3/plugin/note-expression-physical-ui-mapping.cpp', 'src/common/serialization/vst3/plugin/plugin-base.cpp', 'src/common/serialization/vst3/plugin/prefetchable-support.cpp', 'src/common/serialization/vst3/plugin/program-list-data.cpp', @@ -216,6 +217,7 @@ if with_vst3 'src/common/serialization/vst3/plugin/keyswitch-controller.cpp', 'src/common/serialization/vst3/plugin/midi-mapping.cpp', 'src/common/serialization/vst3/plugin/note-expression-controller.cpp', + 'src/common/serialization/vst3/plugin/note-expression-physical-ui-mapping.cpp', 'src/common/serialization/vst3/plugin/plugin-base.cpp', 'src/common/serialization/vst3/plugin/prefetchable-support.cpp', 'src/common/serialization/vst3/plugin/program-list-data.cpp', diff --git a/src/common/serialization/vst3/README.md b/src/common/serialization/vst3/README.md index fbbaf3fc..18ef30f2 100644 --- a/src/common/serialization/vst3/README.md +++ b/src/common/serialization/vst3/README.md @@ -12,33 +12,34 @@ The following interfaces are not yet implemented: VST3 plugin interfaces are implemented as follows: -| yabridge class | Included in | Interfaces | -| ------------------------------- | ------------------- | ------------------------------------------------------ | -| `YaPluginFactory` | | `IPluginFactory`, `IPluginFactory2`, `IPluginFactory3` | -| `Vst3ConnectionPointProxy` | | `IConnectionPoint` through `YaConnectionPoint` | -| `Vst3PlugViewProxy` | | All of the below: | -| `YaParameterFinder` | `Vst3PlugViewProxy` | `IParameterFinder` | -| `YaPlugView` | `Vst3PlugViewProxy` | `IPlugView` | -| `YaPlugViewContentScaleSupport` | `Vst3PlugViewProxy` | `IPlugViewContentScaleSupport` | -| `Vst3PluginProxy` | | All of the below: | -| `YaAudioPresentationLatency` | `Vst3PluginProxy` | `IAudioPresentationLatency` | -| `YaAudioProcessor` | `Vst3PluginProxy` | `IAudioProcessor` | -| `YaAutomationState` | `Vst3PluginProxy` | `IAutomationState` | -| `YaComponent` | `Vst3PluginProxy` | `IComponent` | -| `YaConnectionPoint` | `Vst3PluginProxy` | `IConnectionPoint` | -| `YaEditController` | `Vst3PluginProxy` | `IEditController` | -| `YaEditController2` | `Vst3PluginProxy` | `IEditController2` | -| `YaEditControllerHostEditing` | `Vst3PluginProxy` | `IEditControllerHostEditing` | -| `YaInfoListener` | `Vst3PluginProxy` | `IInfoListener` | -| `YaKeyswitchController` | `Vst3PluginProxy` | `IKeyswitchController` | -| `YaMidiMapping` | `Vst3PluginProxy` | `IMidiMapping` | -| `YaNoteExpressionController` | `Vst3PluginProxy` | `INoteExpressionController` | -| `YaPluginBase` | `Vst3PluginProxy` | `IPluginBase` | -| `YaPrefetchableSupport` | `Vst3PluginProxy` | `IPrefetchableSupport` | -| `YaProgramListData` | `Vst3PluginProxy` | `IProgramListData` | -| `YaUnitData` | `Vst3PluginProxy` | `IUnitData` | -| `YaUnitInfo` | `Vst3PluginProxy` | `IUnitInfo` | -| `YaXmlRepresentationController` | `Vst3PluginProxy` | `IXmlRepresentationController` | +| yabridge class | Included in | Interfaces | +| ----------------------------------- | ------------------- | ------------------------------------------------------ | +| `YaPluginFactory` | | `IPluginFactory`, `IPluginFactory2`, `IPluginFactory3` | +| `Vst3ConnectionPointProxy` | | `IConnectionPoint` through `YaConnectionPoint` | +| `Vst3PlugViewProxy` | | All of the below: | +| `YaParameterFinder` | `Vst3PlugViewProxy` | `IParameterFinder` | +| `YaPlugView` | `Vst3PlugViewProxy` | `IPlugView` | +| `YaPlugViewContentScaleSupport` | `Vst3PlugViewProxy` | `IPlugViewContentScaleSupport` | +| `Vst3PluginProxy` | | All of the below: | +| `YaAudioPresentationLatency` | `Vst3PluginProxy` | `IAudioPresentationLatency` | +| `YaAudioProcessor` | `Vst3PluginProxy` | `IAudioProcessor` | +| `YaAutomationState` | `Vst3PluginProxy` | `IAutomationState` | +| `YaComponent` | `Vst3PluginProxy` | `IComponent` | +| `YaConnectionPoint` | `Vst3PluginProxy` | `IConnectionPoint` | +| `YaEditController` | `Vst3PluginProxy` | `IEditController` | +| `YaEditController2` | `Vst3PluginProxy` | `IEditController2` | +| `YaEditControllerHostEditing` | `Vst3PluginProxy` | `IEditControllerHostEditing` | +| `YaInfoListener` | `Vst3PluginProxy` | `IInfoListener` | +| `YaKeyswitchController` | `Vst3PluginProxy` | `IKeyswitchController` | +| `YaMidiMapping` | `Vst3PluginProxy` | `IMidiMapping` | +| `YaNoteExpressionController` | `Vst3PluginProxy` | `INoteExpressionController` | +| `YaNoteExpressionPhysicalUIMapping` | `Vst3PluginProxy` | `INoteExpressionPhysicalUIMapping` | +| `YaPluginBase` | `Vst3PluginProxy` | `IPluginBase` | +| `YaPrefetchableSupport` | `Vst3PluginProxy` | `IPrefetchableSupport` | +| `YaProgramListData` | `Vst3PluginProxy` | `IProgramListData` | +| `YaUnitData` | `Vst3PluginProxy` | `IUnitData` | +| `YaUnitInfo` | `Vst3PluginProxy` | `IUnitInfo` | +| `YaXmlRepresentationController` | `Vst3PluginProxy` | `IXmlRepresentationController` | VST3 host interfaces are implemented as follows: diff --git a/src/common/serialization/vst3/plugin/note-expression-physical-ui-mapping.cpp b/src/common/serialization/vst3/plugin/note-expression-physical-ui-mapping.cpp new file mode 100644 index 00000000..81373669 --- /dev/null +++ b/src/common/serialization/vst3/plugin/note-expression-physical-ui-mapping.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 "note-expression-physical-ui-mapping.h" + +YaNoteExpressionPhysicalUIMapping::ConstructArgs::ConstructArgs() {} + +YaNoteExpressionPhysicalUIMapping::ConstructArgs::ConstructArgs( + Steinberg::IPtr object) + : supported(Steinberg::FUnknownPtr< + Steinberg::Vst::INoteExpressionPhysicalUIMapping>(object)) {} + +YaNoteExpressionPhysicalUIMapping::YaNoteExpressionPhysicalUIMapping( + const ConstructArgs&& args) + : arguments(std::move(args)) {} diff --git a/src/common/serialization/vst3/plugin/note-expression-physical-ui-mapping.h b/src/common/serialization/vst3/plugin/note-expression-physical-ui-mapping.h new file mode 100644 index 00000000..0565cb51 --- /dev/null +++ b/src/common/serialization/vst3/plugin/note-expression-physical-ui-mapping.h @@ -0,0 +1,76 @@ +// 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" +#include "../physical-ui-map-list.h" + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" + +/** + * Wraps around `INoteExpressionPhysicalUIMapping` for serialization purposes. + * This is instantiated as part of `Vst3PluginProxy`. + */ +class YaNoteExpressionPhysicalUIMapping + : public Steinberg::Vst::INoteExpressionPhysicalUIMapping { + public: + /** + * These are the arguments for creating a + * `YaNoteExpressionPhysicalUIMapping`. + */ + struct ConstructArgs { + ConstructArgs(); + + /** + * Check whether an existing implementation implements + * `INoteExpressionPhysicalUIMapping` 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. + */ + YaNoteExpressionPhysicalUIMapping(const ConstructArgs&& args); + + inline bool supported() const { return arguments.supported; } + + virtual tresult PLUGIN_API + getPhysicalUIMapping(int32 busIndex, + int16 channel, + Steinberg::Vst::PhysicalUIMapList& list) override = 0; + + protected: + ConstructArgs arguments; +}; + +#pragma GCC diagnostic pop