diff --git a/meson.build b/meson.build index 281e08bb..81aaa8bb 100644 --- a/meson.build +++ b/meson.build @@ -104,6 +104,7 @@ vst3_plugin_sources = [ 'src/common/serialization/vst3/plugin/connection-point.cpp', 'src/common/serialization/vst3/plugin/edit-controller.cpp', 'src/common/serialization/vst3/plugin/edit-controller-2.cpp', + 'src/common/serialization/vst3/plugin/midi-mapping.cpp', 'src/common/serialization/vst3/plugin/note-expression-controller.cpp', 'src/common/serialization/vst3/plugin/plugin-base.cpp', 'src/common/serialization/vst3/plugin/program-list-data.cpp', @@ -165,6 +166,7 @@ if with_vst3 'src/common/serialization/vst3/plugin/connection-point.cpp', 'src/common/serialization/vst3/plugin/edit-controller.cpp', 'src/common/serialization/vst3/plugin/edit-controller-2.cpp', + 'src/common/serialization/vst3/plugin/midi-mapping.cpp', 'src/common/serialization/vst3/plugin/note-expression-controller.cpp', 'src/common/serialization/vst3/plugin/plugin-base.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 faa54479..0befc438 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.0 with the exceptons of +- Every interface introduced after VST 3.0.1 with the exceptons of `IEditController2` and `INoteExpressionController` which has already been implemented - The [Presonus extensions](https://presonussoftware.com/en_US/developer), @@ -26,6 +26,7 @@ VST3 plugin interfaces are implemented as follows: | `YaConnectionPoint` | `Vst3PluginProxy` | `IConnectionPoint` | | `YaEditController` | `Vst3PluginProxy` | `IEditController` | | `YaEditController2` | `Vst3PluginProxy` | `IEditController2` | +| `YaMidiMapping` | `Vst3PluginProxy` | `IMidiMapping` | | `YaNoteExpressionController` | `Vst3PluginProxy` | `INoteExpressionController` | | `YaPluginBase` | `Vst3PluginProxy` | `IPluginBase` | | `YaProgramListData` | `Vst3PluginProxy` | `IProgramListData` | diff --git a/src/common/serialization/vst3/plugin/midi-mapping.cpp b/src/common/serialization/vst3/plugin/midi-mapping.cpp new file mode 100644 index 00000000..95fc998b --- /dev/null +++ b/src/common/serialization/vst3/plugin/midi-mapping.cpp @@ -0,0 +1,26 @@ +// 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 "midi-mapping.h" + +YaMidiMapping::ConstructArgs::ConstructArgs() {} + +YaMidiMapping::ConstructArgs::ConstructArgs( + Steinberg::IPtr object) + : supported(Steinberg::FUnknownPtr(object)) {} + +YaMidiMapping::YaMidiMapping(const ConstructArgs&& args) + : arguments(std::move(args)) {} diff --git a/src/common/serialization/vst3/plugin/midi-mapping.h b/src/common/serialization/vst3/plugin/midi-mapping.h new file mode 100644 index 00000000..06906707 --- /dev/null +++ b/src/common/serialization/vst3/plugin/midi-mapping.h @@ -0,0 +1,74 @@ +// 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" + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" + +/** + * Wraps around `IMidiMapping` for serialization purposes. This is instantiated + * as part of `Vst3PluginProxy`. + */ +class YaMidiMapping : public Steinberg::Vst::IMidiMapping { + public: + /** + * These are the arguments for creating a `YaMidiMapping`. + */ + struct ConstructArgs { + ConstructArgs(); + + /** + * Check whether an existing implementation implements `IMidiMapping` + * 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. + */ + YaMidiMapping(const ConstructArgs&& args); + + inline bool supported() const { return arguments.supported; } + + virtual tresult PLUGIN_API + getMidiControllerAssignment(int32 busIndex, + int16 channel, + Steinberg::Vst::CtrlNumber midiControllerNumber, + Steinberg::Vst::ParamID& id /*out*/) = 0; + + protected: + ConstructArgs arguments; +}; + +#pragma GCC diagnostic pop