diff --git a/meson.build b/meson.build
index 4253245a..8c551ba0 100644
--- a/meson.build
+++ b/meson.build
@@ -98,6 +98,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/note-expression-controller.cpp',
'src/common/serialization/vst3/plugin/plugin-base.cpp',
'src/common/serialization/vst3/plugin/program-list-data.cpp',
'src/common/serialization/vst3/plugin/unit-data.cpp',
@@ -158,6 +159,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/note-expression-controller.cpp',
'src/common/serialization/vst3/plugin/plugin-base.cpp',
'src/common/serialization/vst3/plugin/program-list-data.cpp',
'src/common/serialization/vst3/plugin/unit-data.cpp',
diff --git a/src/common/serialization/vst3/README.md b/src/common/serialization/vst3/README.md
index 22f64cbb..faa54479 100644
--- a/src/common/serialization/vst3/README.md
+++ b/src/common/serialization/vst3/README.md
@@ -6,28 +6,31 @@ for more information on how the serialization works.
The following interfaces are not yet implemented:
-- Every interface introduced after VST 3.0.0
+- Every interface introduced after VST 3.0.0 with the exceptons of
+ `IEditController2` and `INoteExpressionController` which has already been
+ implemented
- The [Presonus extensions](https://presonussoftware.com/en_US/developer),
although most of these things seem to overlap with newer VST3 interfaces
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: |
-| `YaPlugView` | `Vst3PlugViewProxy` | `IPlugView` |
-| `Vst3PluginProxy` | | All of the below: |
-| `YaAudioProcessor` | `Vst3PluginProxy` | `IAudioProcessor` |
-| `YaComponent` | `Vst3PluginProxy` | `IComponent` |
-| `YaConnectionPoint` | `Vst3PluginProxy` | `IConnectionPoint` |
-| `YaEditController` | `Vst3PluginProxy` | `IEditController` |
-| `YaEditController2` | `Vst3PluginProxy` | `IEditController2` |
-| `YaPluginBase` | `Vst3PluginProxy` | `IPluginBase` |
-| `YaProgramListData` | `Vst3PluginProxy` | `IProgramListData` |
-| `YaUnitData` | `Vst3PluginProxy` | `IUnitData` |
-| `YaUnitInfo` | `Vst3PluginProxy` | `IUnitInfo` |
+| yabridge class | Included in | Interfaces |
+| ---------------------------- | ------------------- | ------------------------------------------------------ |
+| `YaPluginFactory` | | `IPluginFactory`, `IPluginFactory2`, `IPluginFactory3` |
+| `Vst3ConnectionPointProxy` | | `IConnectionPoint` through `YaConnectionPoint` |
+| `Vst3PlugViewProxy` | | All of the below: |
+| `YaPlugView` | `Vst3PlugViewProxy` | `IPlugView` |
+| `Vst3PluginProxy` | | All of the below: |
+| `YaAudioProcessor` | `Vst3PluginProxy` | `IAudioProcessor` |
+| `YaComponent` | `Vst3PluginProxy` | `IComponent` |
+| `YaConnectionPoint` | `Vst3PluginProxy` | `IConnectionPoint` |
+| `YaEditController` | `Vst3PluginProxy` | `IEditController` |
+| `YaEditController2` | `Vst3PluginProxy` | `IEditController2` |
+| `YaNoteExpressionController` | `Vst3PluginProxy` | `INoteExpressionController` |
+| `YaPluginBase` | `Vst3PluginProxy` | `IPluginBase` |
+| `YaProgramListData` | `Vst3PluginProxy` | `IProgramListData` |
+| `YaUnitData` | `Vst3PluginProxy` | `IUnitData` |
+| `YaUnitInfo` | `Vst3PluginProxy` | `IUnitInfo` |
VST3 host interfaces are implemented as follows:
diff --git a/src/common/serialization/vst3/plugin/note-expression-controller.cpp b/src/common/serialization/vst3/plugin/note-expression-controller.cpp
new file mode 100644
index 00000000..f127964c
--- /dev/null
+++ b/src/common/serialization/vst3/plugin/note-expression-controller.cpp
@@ -0,0 +1,29 @@
+// 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-controller.h"
+
+YaNoteExpressionController::ConstructArgs::ConstructArgs() {}
+
+YaNoteExpressionController::ConstructArgs::ConstructArgs(
+ Steinberg::IPtr object)
+ : supported(
+ Steinberg::FUnknownPtr(
+ object)) {}
+
+YaNoteExpressionController::YaNoteExpressionController(
+ const ConstructArgs&& args)
+ : arguments(std::move(args)) {}
diff --git a/src/common/serialization/vst3/plugin/note-expression-controller.h b/src/common/serialization/vst3/plugin/note-expression-controller.h
new file mode 100644
index 00000000..e272c6f2
--- /dev/null
+++ b/src/common/serialization/vst3/plugin/note-expression-controller.h
@@ -0,0 +1,90 @@
+// 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 `INoteExpressionController` for serialization purposes. This is
+ * instantiated as part of `Vst3PluginProxy`.
+ */
+class YaNoteExpressionController
+ : public Steinberg::Vst::INoteExpressionController {
+ public:
+ /**
+ * These are the arguments for creating a `YaNoteExpressionController`.
+ */
+ struct ConstructArgs {
+ ConstructArgs();
+
+ /**
+ * Check whether an existing implementation implements
+ * `INoteExpressionController` 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.
+ */
+ YaNoteExpressionController(const ConstructArgs&& args);
+
+ inline bool supported() const { return arguments.supported; }
+
+ virtual int32 PLUGIN_API getNoteExpressionCount(int32 busIndex,
+ int16 channel) override = 0;
+ virtual tresult PLUGIN_API getNoteExpressionInfo(
+ int32 busIndex,
+ int16 channel,
+ int32 noteExpressionIndex,
+ Steinberg::Vst::NoteExpressionTypeInfo& info /*out*/) override = 0;
+ virtual tresult PLUGIN_API getNoteExpressionStringByValue(
+ int32 busIndex,
+ int16 channel,
+ Steinberg::Vst::NoteExpressionTypeID id,
+ Steinberg::Vst::NoteExpressionValue valueNormalized /*in*/,
+ Steinberg::Vst::String128 string /*out*/) override = 0;
+ virtual tresult PLUGIN_API getNoteExpressionValueByString(
+ int32 busIndex,
+ int16 channel,
+ Steinberg::Vst::NoteExpressionTypeID id,
+ const Steinberg::Vst::TChar* string /*in*/,
+ Steinberg::Vst::NoteExpressionValue& valueNormalized /*out*/)
+ override = 0;
+
+ protected:
+ ConstructArgs arguments;
+};
+
+#pragma GCC diagnostic pop