From 77b5becf75c8842cd30ee99d326782894fb334d3 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Mon, 27 May 2024 11:39:49 +0200
Subject: [PATCH] Fixed mixed-usage headless/normal CardinalPluginContext

Signed-off-by: falkTX <falktx@falktx.com>
---
 include/plugincontext.hpp |  4 ----
 src/CardinalCommon.cpp    | 14 +++++---------
 src/Makefile              |  1 +
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/include/plugincontext.hpp b/include/plugincontext.hpp
index 74def30..661b31d 100644
--- a/include/plugincontext.hpp
+++ b/include/plugincontext.hpp
@@ -89,16 +89,12 @@ struct CardinalPluginContext : rack::Context {
     const CardinalDISTRHO::MidiEvent* midiEvents;
     uint32_t midiEventCount;
     CardinalDISTRHO::Plugin* const plugin;
-   #ifndef HEADLESS
     CardinalDGL::NanoTopLevelWidget* tlw;
     CardinalDISTRHO::UI* ui;
-   #endif
     CardinalPluginContext(CardinalDISTRHO::Plugin* const p);
     void writeMidiMessage(const rack::midi::Message& message, uint8_t channel);
-   #ifndef HEADLESS
     bool addIdleCallback(IdleCallback* cb) const;
     void removeIdleCallback(IdleCallback* cb) const;
-   #endif
 };
 
 #ifndef HEADLESS
diff --git a/src/CardinalCommon.cpp b/src/CardinalCommon.cpp
index fd21343..3226cc0 100644
--- a/src/CardinalCommon.cpp
+++ b/src/CardinalCommon.cpp
@@ -162,19 +162,16 @@ CardinalPluginContext::CardinalPluginContext(Plugin* const p)
       dataOuts(nullptr),
       midiEvents(nullptr),
       midiEventCount(0),
-      plugin(p)
-   #ifndef HEADLESS
-    , tlw(nullptr)
-    , ui(nullptr)
-   #endif
+      plugin(p),
+      tlw(nullptr),
+      ui(nullptr)
 {
     std::memset(parameters, 0, sizeof(parameters));
 }
 
-#ifndef HEADLESS
 bool CardinalPluginContext::addIdleCallback(IdleCallback* const cb) const
 {
-   #ifndef CARDINAL_COMMON_DSP_ONLY
+   #if !(defined(HEADLESS) || defined(CARDINAL_COMMON_DSP_ONLY))
     if (ui != nullptr)
     {
         ui->addIdleCallback(cb);
@@ -190,7 +187,7 @@ bool CardinalPluginContext::addIdleCallback(IdleCallback* const cb) const
 
 void CardinalPluginContext::removeIdleCallback(IdleCallback* const cb) const
 {
-   #ifndef CARDINAL_COMMON_DSP_ONLY
+   #if !(defined(HEADLESS) || defined(CARDINAL_COMMON_DSP_ONLY))
     if (ui != nullptr)
         ui->removeIdleCallback(cb);
    #else
@@ -198,7 +195,6 @@ void CardinalPluginContext::removeIdleCallback(IdleCallback* const cb) const
     (void)cb;
    #endif
 }
-#endif
 
 void CardinalPluginContext::writeMidiMessage(const rack::midi::Message& message, const uint8_t channel)
 {
diff --git a/src/Makefile b/src/Makefile
index 0e892e1..48d3bed 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -141,6 +141,7 @@ native: $(TARGETS)
 
 mini: $(TARGETS)
 	$(MAKE) jack -C CardinalMini
+	$(MAKE) lv2_sep -C CardinalMiniSep
 
 au: $(TARGETS)
 	$(MAKE) au -C CardinalFX $(CARDINAL_SYNTH_ARGS)