From 5e26d30752367623acd64ffc3caa030f718de997 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Sat, 26 Dec 2020 14:12:40 +0100 Subject: [PATCH] Add a wrapper for IUnitHandler --- CHANGELOG.md | 4 +- README.md | 8 +- meson.build | 2 + src/common/serialization/vst3/README.md | 1 + .../vst3/component-handler/unit-handler.cpp | 26 +++++++ .../vst3/component-handler/unit-handler.h | 74 +++++++++++++++++++ 6 files changed, 109 insertions(+), 6 deletions(-) create mode 100644 src/common/serialization/vst3/component-handler/unit-handler.cpp create mode 100644 src/common/serialization/vst3/component-handler/unit-handler.h diff --git a/CHANGELOG.md b/CHANGELOG.md index 07ad7728..613f38d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] -TODO: Remove the mentions of VST3 support not yet being part of the released -version from the readme +TODO: Remove the mentions of VST3 support not yet being part of the released version from the readme +TODO: Add an updates screenshot with some fancy VST3-only plugins to the readme ### Added diff --git a/README.md b/README.md index bc44f820..5387c579 100644 --- a/README.md +++ b/README.md @@ -19,11 +19,11 @@ on the master branch._ This branch is still very far removed from being in a usable state. Below is an incomplete list of things that still have to be done before this can be used: -- Interfaces left to implement: - - All other mandatory and optional VST 3.0 interfaces - - All interfaces introduced after that -- Fully implemented: see [this +- Support all VST 3.7.1 interfaces. We're currently support all mandatory VST + 3.0.0 interfaces with one or two missing options interfaces. +- See [this document](https://github.com/robbert-vdh/yabridge/tree/feature/vst3/src/common/serialization/vst3/README.md) + for all fully implemetned interfaces. - Update all the AUR packages for the `libyabridge-vst{2,3}.so` changes. - Test the binaries built on GitHub on plain Ubuntu 18.04, are we missing any static linking? diff --git a/meson.build b/meson.build index b4c42e78..532eb9a3 100644 --- a/meson.build +++ b/meson.build @@ -86,6 +86,7 @@ vst3_plugin_sources = [ 'src/common/serialization/vst3/plugin/edit-controller-2.cpp', 'src/common/serialization/vst3/plugin/plugin-base.cpp', 'src/common/serialization/vst3/component-handler/component-handler.cpp', + 'src/common/serialization/vst3/component-handler/unit-handler.cpp', 'src/common/serialization/vst3/host-context/host-application.cpp', 'src/common/serialization/vst3/attribute-list.cpp', 'src/common/serialization/vst3/base.cpp', @@ -142,6 +143,7 @@ if with_vst3 'src/common/serialization/vst3/plugin/edit-controller-2.cpp', 'src/common/serialization/vst3/plugin/plugin-base.cpp', 'src/common/serialization/vst3/component-handler/component-handler.cpp', + 'src/common/serialization/vst3/component-handler/unit-handler.cpp', 'src/common/serialization/vst3/host-context/host-application.cpp', 'src/common/serialization/vst3/attribute-list.cpp', 'src/common/serialization/vst3/base.cpp', diff --git a/src/common/serialization/vst3/README.md b/src/common/serialization/vst3/README.md index b9b8aeae..7fb81ac4 100644 --- a/src/common/serialization/vst3/README.md +++ b/src/common/serialization/vst3/README.md @@ -29,6 +29,7 @@ VST3 host interfaces are implemented as follows: | `YaHostApplication` | `Vst3HostContextProxy` | `IHostApplication` | | `Vst3ComponentHandlerProxy` | | All of the below: | | `YaComponentHandler` | `Vst3ComponentHandlerProxy` | `IComponentHandler` | +| `YaUnitHandler` | `Vst3ComponentHandlerProxy` | `IUnitHandler` | | `Vst3PlugFrameProxy` | | All of the below: | | `YaPlugFrame` | `Vst3PlugFrameProxy` | `IPlugFrame` | diff --git a/src/common/serialization/vst3/component-handler/unit-handler.cpp b/src/common/serialization/vst3/component-handler/unit-handler.cpp new file mode 100644 index 00000000..cd04034e --- /dev/null +++ b/src/common/serialization/vst3/component-handler/unit-handler.cpp @@ -0,0 +1,26 @@ +// yabridge: a Wine VST bridge +// Copyright (C) 2020 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 "unit-handler.h" + +YaUnitHandler::ConstructArgs::ConstructArgs() {} + +YaUnitHandler::ConstructArgs::ConstructArgs( + Steinberg::IPtr object) + : supported(Steinberg::FUnknownPtr(object)) {} + +YaUnitHandler::YaUnitHandler(const ConstructArgs&& args) + : arguments(std::move(args)) {} diff --git a/src/common/serialization/vst3/component-handler/unit-handler.h b/src/common/serialization/vst3/component-handler/unit-handler.h new file mode 100644 index 00000000..b861eb70 --- /dev/null +++ b/src/common/serialization/vst3/component-handler/unit-handler.h @@ -0,0 +1,74 @@ +// yabridge: a Wine VST bridge +// Copyright (C) 2020 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 `IUnitHandler` for serialization purposes. This is instantiated + * as part of `Vst3UnitHandlerProxy`. + */ +class YaUnitHandler : public Steinberg::Vst::IUnitHandler { + public: + /** + * These are the arguments for creating a `YaUnitHandler`. + */ + struct ConstructArgs { + ConstructArgs(); + + /** + * Check whether an existing implementation implements `IUnitHandler` + * 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. + */ + YaUnitHandler(const ConstructArgs&& args); + + inline bool supported() const { return arguments.supported; } + + virtual tresult PLUGIN_API + notifyUnitSelection(Steinberg::Vst::UnitID unitId) override = 0; + virtual tresult PLUGIN_API + notifyProgramListChange(Steinberg::Vst::ProgramListID listId, + int32 programIndex) override = 0; + + protected: + ConstructArgs arguments; +}; + +#pragma GCC diagnostic pop