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

More build fixes

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2024-04-15 15:36:09 +02:00 • committed by Filipe Coelho
parent 73e75ce012
commit a6a83f3dae
4 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/plugincontext.hpp
View file

@ -89,8 +89,10 @@ 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 #ifndef HEADLESS

2
plugins/Makefile
View file

@ -579,7 +579,7 @@ PLUGIN_FILES += $(filter-out Biset/src/plugin.cpp,$(wildcard Biset/src/*.cpp))
PLUGIN_FILES += $(wildcard Biset/src/*/*.cpp) PLUGIN_FILES += $(wildcard Biset/src/*/*.cpp)
# modules/types which are present in other plugins # modules/types which are present in other plugins
BISET_CUSTOM = Blank ButtonTrigger Clock Tree BISET_CUSTOM = Blank ButtonTrigger Clock Tree TreeDisplay
# -------------------------------------------------------------- # --------------------------------------------------------------
# BogaudioModules # BogaudioModules

28
plugins/plugins.cpp
View file

@ -147,15 +147,33 @@ extern Model* modelChord;
#include "Bidoo/src/plugin.hpp" #include "Bidoo/src/plugin.hpp"
// Biset // Biset
/* NOTE too much noise in original include, do this a different way
// #include "Biset/src/plugin.hpp"
*/
#define modelBlank modelBisetBlank #define modelBlank modelBisetBlank
#define modelTree modelBisetTree #define modelTree modelBisetTree
#define Clock BisetClock extern Model* modelTracker;
#define ButtonTrigger BisetButtonTrigger extern Model* modelTrackerSynth;
#include "Biset/src/plugin.hpp" extern Model* modelTrackerDrum;
extern Model* modelTrackerClock;
extern Model* modelTrackerPhase;
extern Model* modelTrackerQuant;
extern Model* modelTrackerState;
extern Model* modelTrackerControl;
extern Model* modelRegex;
extern Model* modelRegexCondensed;
extern Model* modelRegexExp;
extern Model* modelTree;
extern Model* modelTreeSeed;
extern Model* modelGbu;
extern Model* modelPkm;
extern Model* modelIgc;
extern Model* modelOmega3;
extern Model* modelOmega6;
extern Model* modelSegfault;
extern Model* modelBlank;
#undef modelBlank #undef modelBlank
#undef modelTree #undef modelTree
#undef ButtonTrigger
#undef Clock
// BogaudioModules - integrate theme/skin support // BogaudioModules - integrate theme/skin support
#include <mutex> #include <mutex>

2
src/CardinalUI.cpp
View file

@ -1081,7 +1081,7 @@ protected:
int key; int key;
switch (ev.key) switch (ev.key)
{ {
case '\t': key = GLFW_KEY_TAB; break; case kKeyTab: key = GLFW_KEY_TAB; break;
case kKeyBackspace: key = GLFW_KEY_BACKSPACE; break; case kKeyBackspace: key = GLFW_KEY_BACKSPACE; break;
case kKeyEnter: key = GLFW_KEY_ENTER; break; case kKeyEnter: key = GLFW_KEY_ENTER; break;
case kKeyEscape: key = GLFW_KEY_ESCAPE; break; case kKeyEscape: key = GLFW_KEY_ESCAPE; break;