Rename a file to prevent conflicts

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Apr 15, 2024 · df0f1ac · df0f1ac
1 parent a6a83f3
commit df0f1ac
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 19 deletions.
diff --git 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 <asset.hpp>
@@ -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
@@ -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 → src/CardinalPluginContext.hpp b/src/PluginContext.hpp → src/CardinalPluginContext.hpp
diff --git a/src/CardinalRemote.cpp b/src/CardinalRemote.cpp
@@ -1,6 +1,6 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021-2022 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
  *
  * 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
@@ -1,6 +1,6 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021-2022 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
  *
  * 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 <widget/Widget.hpp>

diff --git a/src/CardinalRemote/main.cpp b/src/CardinalRemote/main.cpp
@@ -1,6 +1,6 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021-2022 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
  *
  * 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 <engine/Engine.hpp>
 #include <ui/common.hpp>
 
-#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
@@ -1,6 +1,6 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
  *
  * 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
@@ -1,6 +1,6 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
  *
  * 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 <GLFW/glfw3.h>
 

diff --git a/src/override/MenuBar.cpp b/src/override/MenuBar.cpp
@@ -1,6 +1,6 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
  *
  * 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
@@ -1,6 +1,6 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
  *
  * 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