diff --git a/meson.build b/meson.build index 75130443..e0ebb398 100644 --- a/meson.build +++ b/meson.build @@ -99,6 +99,7 @@ vst3_plugin_sources = [ 'src/common/serialization/vst3/plugin/edit-controller.cpp', 'src/common/serialization/vst3/plugin/edit-controller-2.cpp', 'src/common/serialization/vst3/plugin/plugin-base.cpp', + 'src/common/serialization/vst3/plugin/program-list-data.cpp', 'src/common/serialization/vst3/plugin/unit-info.cpp', 'src/common/serialization/vst3/component-handler/component-handler.cpp', 'src/common/serialization/vst3/component-handler/unit-handler.cpp', @@ -157,6 +158,7 @@ if with_vst3 'src/common/serialization/vst3/plugin/edit-controller.cpp', 'src/common/serialization/vst3/plugin/edit-controller-2.cpp', 'src/common/serialization/vst3/plugin/plugin-base.cpp', + 'src/common/serialization/vst3/plugin/program-list-data.cpp', 'src/common/serialization/vst3/plugin/unit-info.cpp', 'src/common/serialization/vst3/component-handler/component-handler.cpp', 'src/common/serialization/vst3/component-handler/unit-handler.cpp', diff --git a/src/common/serialization/vst3/README.md b/src/common/serialization/vst3/README.md index 16cc4050..097fdad6 100644 --- a/src/common/serialization/vst3/README.md +++ b/src/common/serialization/vst3/README.md @@ -1,7 +1,7 @@ # VST3 interfaces -We currently support all VST 3.0.0 interfaces with the exceptions of -`IProgramListData` and `IUnitData`. See +We currently support all VST 3.0.0 interfaces with the exception of `IUnitData`. +See [docs/vst3.md](https://github.com/robbert-vdh/yabridge/blob/master/docs/vst3.md) for more information on how the serialization works. @@ -20,6 +20,7 @@ VST3 plugin interfaces are implemented as follows: | `YaEditController` | `Vst3PluginProxy` | `IEditController` | | `YaEditController2` | `Vst3PluginProxy` | `IEditController2` | | `YaPluginBase` | `Vst3PluginProxy` | `IPluginBase` | +| `YaProgramListData` | `Vst3PluginProxy` | `IProgramListData` | | `YaUnitInfo` | `Vst3PluginProxy` | `IUnitInfo` | VST3 host interfaces are implemented as follows: diff --git a/src/common/serialization/vst3/plugin/program-list-data.cpp b/src/common/serialization/vst3/plugin/program-list-data.cpp new file mode 100644 index 00000000..3e76e812 --- /dev/null +++ b/src/common/serialization/vst3/plugin/program-list-data.cpp @@ -0,0 +1,27 @@ +// 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 "program-list-data.h" + +YaProgramListData::ConstructArgs::ConstructArgs() {} + +YaProgramListData::ConstructArgs::ConstructArgs( + Steinberg::IPtr object) + : supported( + Steinberg::FUnknownPtr(object)) {} + +YaProgramListData::YaProgramListData(const ConstructArgs&& args) + : arguments(std::move(args)) {} diff --git a/src/common/serialization/vst3/plugin/program-list-data.h b/src/common/serialization/vst3/plugin/program-list-data.h new file mode 100644 index 00000000..75ed089b --- /dev/null +++ b/src/common/serialization/vst3/plugin/program-list-data.h @@ -0,0 +1,79 @@ +// 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 `IProgramListData` for serialization purposes. This is + * instantiated as part of `Vst3PluginProxy`. + */ +class YaProgramListData : public Steinberg::Vst::IProgramListData { + public: + /** + * These are the arguments for creating a `YaProgramListData`. + */ + struct ConstructArgs { + ConstructArgs(); + + /** + * Check whether an existing implementation implements + * `IProgramListData` 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. + */ + YaProgramListData(const ConstructArgs&& args); + + inline bool supported() const { return arguments.supported; } + + virtual tresult PLUGIN_API + programDataSupported(Steinberg::Vst::ProgramListID listId) override = 0; + virtual tresult PLUGIN_API + getProgramData(Steinberg::Vst::ProgramListID listId, + int32 programIndex, + Steinberg::IBStream* data) override = 0; + virtual tresult PLUGIN_API + setProgramData(Steinberg::Vst::ProgramListID listId, + int32 programIndex, + Steinberg::IBStream* data) override = 0; + + protected: + ConstructArgs arguments; +}; + +#pragma GCC diagnostic pop diff --git a/src/common/serialization/vst3/plugin/unit-info.h b/src/common/serialization/vst3/plugin/unit-info.h index f0d04095..1708336a 100644 --- a/src/common/serialization/vst3/plugin/unit-info.h +++ b/src/common/serialization/vst3/plugin/unit-info.h @@ -20,7 +20,6 @@ #include "../../common.h" #include "../base.h" -#include "../host-context-proxy.h" #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"