From df0f1ac1dbb7b623330eef75fced38983be9c1fb Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 15 Apr 2024 17:58:44 +0200 Subject: [PATCH] Rename a file to prevent conflicts Signed-off-by: falkTX --- src/CardinalCommon.cpp | 10 ++++++---- src/CardinalPlugin.cpp | 2 +- src/{PluginContext.hpp => CardinalPluginContext.hpp} | 0 src/CardinalRemote.cpp | 4 ++-- src/CardinalRemote/RemoteUI.hpp | 4 ++-- src/CardinalRemote/main.cpp | 4 ++-- src/CardinalUI.cpp | 4 ++-- src/custom/glfw.cpp | 4 ++-- src/override/MenuBar.cpp | 4 ++-- src/override/Window.cpp | 4 ++-- 10 files changed, 21 insertions(+), 19 deletions(-) rename src/{PluginContext.hpp => CardinalPluginContext.hpp} (100%) diff --git a/src/CardinalCommon.cpp b/src/CardinalCommon.cpp index a26e5c9..5512e5e 100644 --- a/src/CardinalCommon.cpp +++ b/src/CardinalCommon.cpp @@ -17,7 +17,7 @@ #include "CardinalCommon.hpp" #include "AsyncDialog.hpp" -#include "PluginContext.hpp" +#include "CardinalPluginContext.hpp" #include "DistrhoPluginUtils.hpp" #include @@ -162,9 +162,11 @@ CardinalPluginContext::CardinalPluginContext(Plugin* const p) dataOuts(nullptr), midiEvents(nullptr), midiEventCount(0), - plugin(p), - tlw(nullptr), - ui(nullptr) + plugin(p) + #ifndef HEADLESS + , tlw(nullptr) + , ui(nullptr) + #endif { std::memset(parameters, 0, sizeof(parameters)); } diff --git a/src/CardinalPlugin.cpp b/src/CardinalPlugin.cpp index 09d6a1a..3ed2fe9 100644 --- a/src/CardinalPlugin.cpp +++ b/src/CardinalPlugin.cpp @@ -32,7 +32,7 @@ #include "CardinalCommon.hpp" #include "DistrhoPluginUtils.hpp" -#include "PluginContext.hpp" +#include "CardinalPluginContext.hpp" #include "extra/Base64.hpp" #include "extra/ScopedDenormalDisable.hpp" #include "extra/ScopedSafeLocale.hpp" diff --git a/src/PluginContext.hpp b/src/CardinalPluginContext.hpp similarity index 100% rename from src/PluginContext.hpp rename to src/CardinalPluginContext.hpp diff --git a/src/CardinalRemote.cpp b/src/CardinalRemote.cpp index c795137..14db71d 100644 --- a/src/CardinalRemote.cpp +++ b/src/CardinalRemote.cpp @@ -1,6 +1,6 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2022 Filipe Coelho + * Copyright (C) 2021-2024 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -24,7 +24,7 @@ #endif #include "CardinalRemote.hpp" -#include "PluginContext.hpp" +#include "CardinalPluginContext.hpp" #include "extra/Base64.hpp" #include "extra/ScopedSafeLocale.hpp" diff --git a/src/CardinalRemote/RemoteUI.hpp b/src/CardinalRemote/RemoteUI.hpp index 15b1c90..ab428fc 100644 --- a/src/CardinalRemote/RemoteUI.hpp +++ b/src/CardinalRemote/RemoteUI.hpp @@ -1,6 +1,6 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2022 Filipe Coelho + * Copyright (C) 2021-2024 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -18,7 +18,7 @@ #pragma once #include "NanoVG.hpp" -#include "PluginContext.hpp" +#include "CardinalPluginContext.hpp" #include "WindowParameters.hpp" #include diff --git a/src/CardinalRemote/main.cpp b/src/CardinalRemote/main.cpp index 381b086..c7fca63 100644 --- a/src/CardinalRemote/main.cpp +++ b/src/CardinalRemote/main.cpp @@ -1,6 +1,6 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2022 Filipe Coelho + * Copyright (C) 2021-2024 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -30,7 +30,7 @@ #include #include -#include "PluginContext.hpp" +#include "CardinalPluginContext.hpp" #include "extra/ScopedValueSetter.hpp" #define CARDINAL_TEMPLATE_NAME "init/main.vcv" diff --git a/src/CardinalUI.cpp b/src/CardinalUI.cpp index 3f9cabb..b088e59 100644 --- a/src/CardinalUI.cpp +++ b/src/CardinalUI.cpp @@ -1,6 +1,6 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2023 Filipe Coelho + * Copyright (C) 2021-2024 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -49,7 +49,7 @@ #include "Application.hpp" #include "AsyncDialog.hpp" #include "CardinalCommon.hpp" -#include "PluginContext.hpp" +#include "CardinalPluginContext.hpp" #include "WindowParameters.hpp" #include "extra/Base64.hpp" diff --git a/src/custom/glfw.cpp b/src/custom/glfw.cpp index e3718d7..b9c72b9 100644 --- a/src/custom/glfw.cpp +++ b/src/custom/glfw.cpp @@ -1,6 +1,6 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2023 Filipe Coelho + * Copyright (C) 2021-2024 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -16,7 +16,7 @@ */ #include "Application.hpp" -#include "PluginContext.hpp" +#include "CardinalPluginContext.hpp" #include diff --git a/src/override/MenuBar.cpp b/src/override/MenuBar.cpp index 7a13f17..77ad6d1 100644 --- a/src/override/MenuBar.cpp +++ b/src/override/MenuBar.cpp @@ -1,6 +1,6 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2023 Filipe Coelho + * Copyright (C) 2021-2024 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -53,7 +53,7 @@ #include "../CardinalCommon.hpp" #include "../CardinalRemote.hpp" -#include "../PluginContext.hpp" +#include "../CardinalPluginContext.hpp" #include "DistrhoPlugin.hpp" #include "DistrhoStandaloneUtils.hpp" diff --git a/src/override/Window.cpp b/src/override/Window.cpp index 2005652..e1b3bf3 100644 --- a/src/override/Window.cpp +++ b/src/override/Window.cpp @@ -1,6 +1,6 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2023 Filipe Coelho + * Copyright (C) 2021-2024 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -46,7 +46,7 @@ #include "Application.hpp" #include "extra/String.hpp" #include "../CardinalCommon.hpp" -#include "../PluginContext.hpp" +#include "../CardinalPluginContext.hpp" #include "../WindowParameters.hpp" #ifndef DGL_NO_SHARED_RESOURCES