From 6195caf53e32f6c667af5f823eabcb22b9b9dcf1 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Sat, 28 Nov 2020 13:58:32 +0100 Subject: [PATCH] Move src/plugin-bridge to src/bridges/vst2 --- README.md | 2 +- meson.build | 2 +- src/plugin/{plugin-bridge.cpp => bridges/vst2.cpp} | 8 ++++---- src/plugin/{plugin-bridge.h => bridges/vst2.h} | 8 ++++---- src/plugin/plugin.cpp | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) rename src/plugin/{plugin-bridge.cpp => bridges/vst2.cpp} (99%) rename src/plugin/{plugin-bridge.h => bridges/vst2.h} (98%) diff --git a/README.md b/README.md index 6f76cfdd..79ed7bae 100644 --- a/README.md +++ b/README.md @@ -619,7 +619,7 @@ launch winedbg in a seperate detached terminal emulator so it doesn't terminate together with the plugin, and winedbg can be a bit picky about the arguments it accepts. I've already set this up behind a feature flag for use in KDE Plasma. Other desktop environments and window managers will require some slight -modifications in `src/plugin/plugin-bridge.cpp`. To enable this, simply run: +modifications in `src/plugin/host-process.cpp`. To enable this, simply run: ```shell meson configure build --buildtype=debug -Dwith-winedbg=true diff --git a/meson.build b/meson.build index fab572d3..c2621b37 100644 --- a/meson.build +++ b/meson.build @@ -86,7 +86,7 @@ shared_library( 'src/common/utils.cpp', 'src/plugin/host-process.cpp', 'src/plugin/plugin.cpp', - 'src/plugin/plugin-bridge.cpp', + 'src/plugin/bridges/vst2.cpp', 'src/plugin/utils.cpp', version_header, ], diff --git a/src/plugin/plugin-bridge.cpp b/src/plugin/bridges/vst2.cpp similarity index 99% rename from src/plugin/plugin-bridge.cpp rename to src/plugin/bridges/vst2.cpp index 44ca3489..13087311 100644 --- a/src/plugin/plugin-bridge.cpp +++ b/src/plugin/bridges/vst2.cpp @@ -14,15 +14,15 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "plugin-bridge.h" +#include "vst2.h" // Generated inside of the build directory #include #include -#include "../common/communication.h" -#include "../common/utils.h" -#include "utils.h" +#include "../../common/communication.h" +#include "../../common/utils.h" +#include "../utils.h" namespace bp = boost::process; // I'd rather use std::filesystem instead, but Boost.Process depends on diff --git a/src/plugin/plugin-bridge.h b/src/plugin/bridges/vst2.h similarity index 98% rename from src/plugin/plugin-bridge.h rename to src/plugin/bridges/vst2.h index c9da720f..d46685ba 100644 --- a/src/plugin/plugin-bridge.h +++ b/src/plugin/bridges/vst2.h @@ -23,10 +23,10 @@ #include #include -#include "../common/communication.h" -#include "../common/configuration.h" -#include "../common/logging.h" -#include "host-process.h" +#include "../../common/communication.h" +#include "../../common/configuration.h" +#include "../../common/logging.h" +#include "../host-process.h" /** * This handles the communication between the Linux native VST plugin and the diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp index ac35d2ca..9060060f 100644 --- a/src/plugin/plugin.cpp +++ b/src/plugin/plugin.cpp @@ -20,7 +20,7 @@ #include #include "../common/logging.h" -#include "plugin-bridge.h" +#include "bridges/vst2.h" #define VST_EXPORT __attribute__((visibility("default")))