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

Use FX variant as base for wasm builds, add input and midi options

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-07-11 14:43:49 +01:00
parent 48a01f0b22
commit e3a7a5ccb8
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
3 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dpf

@ -1 +1 @@
Subproject commit f022c766bd315b5bb22800b9ab78a4e1ec991edc Subproject commit e2e2b5507f683a6b62adbd984b62cdde0ed05c3d

2
src/Makefile
View file

@ -203,7 +203,7 @@ ifeq ($(MOD_BUILD),true)
$(MAKE) -C Cardinal lv2 $(MAKE) -C Cardinal lv2
$(MAKE) -C CardinalFX lv2 $(MAKE) -C CardinalFX lv2
else ifeq ($(WASM),true) else ifeq ($(WASM),true)
$(MAKE) -C CardinalSynth jack $(MAKE) -C CardinalFX jack
else else
$(MAKE) -C Cardinal $(MAKE) -C Cardinal
$(MAKE) -C CardinalFX $(CARDINAL_FX_ARGS) $(MAKE) -C CardinalFX $(CARDINAL_FX_ARGS)

30
src/override/MenuBar.cpp
View file

@ -50,11 +50,15 @@
#include <patch.hpp> #include <patch.hpp>
#include <library.hpp> #include <library.hpp>
#include "../CardinalCommon.hpp"
#ifdef HAVE_LIBLO #ifdef HAVE_LIBLO
# include <lo/lo.h> # include <lo/lo.h>
#endif #endif
#include "../CardinalCommon.hpp" #ifdef DISTRHO_OS_WASM
# include "DistrhoStandaloneUtils.hpp"
#endif
namespace rack { namespace rack {
namespace asset { namespace asset {
@ -604,6 +608,30 @@ struct EngineButton : MenuButton {
menu->addChild(createMenuItem("Performance meters", cpuMeterText, [=]() { menu->addChild(createMenuItem("Performance meters", cpuMeterText, [=]() {
settings::cpuMeter ^= true; settings::cpuMeter ^= true;
})); }));
#ifdef DISTRHO_OS_WASM
if (supportsAudioInput()) {
const bool enabled = isAudioInputEnabled();
std::string text = "Enable Audio Input";
if (enabled)
text += " " CHECKMARK_STRING;
menu->addChild(createMenuItem(text, "", [enabled]() {
if (!enabled)
requestAudioInput();
}));
}
if (supportsMIDI()) {
const bool enabled = isMIDIEnabled();
std::string text = "Enable MIDI";
if (enabled)
text += " " CHECKMARK_STRING;
menu->addChild(createMenuItem(text, "", [enabled]() {
if (!enabled)
requestMIDI();
}));
}
#endif
} }
}; };