brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed mixed-usage headless/normal CardinalPluginContext

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2024-05-27 11:39:49 +02:00
parent ae94366191
commit 77b5becf75
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
3 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/plugincontext.hpp
View file

@ -89,16 +89,12 @@ struct CardinalPluginContext : rack::Context {
const CardinalDISTRHO::MidiEvent* midiEvents; const CardinalDISTRHO::MidiEvent* midiEvents;
uint32_t midiEventCount; uint32_t midiEventCount;
CardinalDISTRHO::Plugin* const plugin; CardinalDISTRHO::Plugin* const plugin;
#ifndef HEADLESS
CardinalDGL::NanoTopLevelWidget* tlw; CardinalDGL::NanoTopLevelWidget* tlw;
CardinalDISTRHO::UI* ui; CardinalDISTRHO::UI* ui;
#endif
CardinalPluginContext(CardinalDISTRHO::Plugin* const p); CardinalPluginContext(CardinalDISTRHO::Plugin* const p);
void writeMidiMessage(const rack::midi::Message& message, uint8_t channel); void writeMidiMessage(const rack::midi::Message& message, uint8_t channel);
#ifndef HEADLESS
bool addIdleCallback(IdleCallback* cb) const; bool addIdleCallback(IdleCallback* cb) const;
void removeIdleCallback(IdleCallback* cb) const; void removeIdleCallback(IdleCallback* cb) const;
#endif
}; };
#ifndef HEADLESS #ifndef HEADLESS

14
src/CardinalCommon.cpp
View file

@ -162,19 +162,16 @@ CardinalPluginContext::CardinalPluginContext(Plugin* const p)
dataOuts(nullptr), dataOuts(nullptr),
midiEvents(nullptr), midiEvents(nullptr),
midiEventCount(0), midiEventCount(0),
plugin(p) plugin(p),
#ifndef HEADLESS tlw(nullptr),
, tlw(nullptr) ui(nullptr)
, ui(nullptr)
#endif
{ {
std::memset(parameters, 0, sizeof(parameters)); std::memset(parameters, 0, sizeof(parameters));
} }
#ifndef HEADLESS
bool CardinalPluginContext::addIdleCallback(IdleCallback* const cb) const bool CardinalPluginContext::addIdleCallback(IdleCallback* const cb) const
{ {
#ifndef CARDINAL_COMMON_DSP_ONLY #if !(defined(HEADLESS) || defined(CARDINAL_COMMON_DSP_ONLY))
if (ui != nullptr) if (ui != nullptr)
{ {
ui->addIdleCallback(cb); ui->addIdleCallback(cb);
@ -190,7 +187,7 @@ bool CardinalPluginContext::addIdleCallback(IdleCallback* const cb) const
void CardinalPluginContext::removeIdleCallback(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) if (ui != nullptr)
ui->removeIdleCallback(cb); ui->removeIdleCallback(cb);
#else #else
@ -198,7 +195,6 @@ void CardinalPluginContext::removeIdleCallback(IdleCallback* const cb) const
(void)cb; (void)cb;
#endif #endif
} }
#endif
void CardinalPluginContext::writeMidiMessage(const rack::midi::Message& message, const uint8_t channel) void CardinalPluginContext::writeMidiMessage(const rack::midi::Message& message, const uint8_t channel)
{ {

1
src/Makefile
View file

@ -141,6 +141,7 @@ native: $(TARGETS)
mini: $(TARGETS) mini: $(TARGETS)
$(MAKE) jack -C CardinalMini $(MAKE) jack -C CardinalMini
$(MAKE) lv2_sep -C CardinalMiniSep
au: $(TARGETS) au: $(TARGETS)
$(MAKE) au -C CardinalFX $(CARDINAL_SYNTH_ARGS) $(MAKE) au -C CardinalFX $(CARDINAL_SYNTH_ARGS)