diff --git a/dpf b/dpf index bd8cc43..49d447b 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit bd8cc43bd1cb5b02f5ef5f5963ecbd266ab03204 +Subproject commit 49d447b4369e0ed97b6a86cddf1843fc9130105c diff --git a/plugins/Common/IldaeilPlugin.cpp b/plugins/Common/IldaeilPlugin.cpp index d3c7b0e..018e792 100644 --- a/plugins/Common/IldaeilPlugin.cpp +++ b/plugins/Common/IldaeilPlugin.cpp @@ -261,7 +261,9 @@ protected: const char* getLabel() const override { -#if DISTRHO_PLUGIN_IS_SYNTH +#if ILDAEIL_STANDALONE + return "Ildaeil"; +#elif DISTRHO_PLUGIN_IS_SYNTH return "IldaeilSynth"; #elif DISTRHO_PLUGIN_WANT_MIDI_OUTPUT return "IldaeilMIDI"; @@ -297,7 +299,9 @@ protected: int64_t getUniqueId() const override { -#if DISTRHO_PLUGIN_IS_SYNTH +#if ILDAEIL_STANDALONE + return d_cconst('d', 'I', 'l', 'd'); +#elif DISTRHO_PLUGIN_IS_SYNTH return d_cconst('d', 'I', 'l', 'S'); #elif DISTRHO_PLUGIN_WANT_MIDI_OUTPUT return d_cconst('d', 'I', 'l', 'M'); @@ -408,7 +412,7 @@ protected: { if (fCarlaPluginHandle != nullptr) { -#if DISTRHO_PLUGIN_WANT_MIDI_INPUT + #if DISTRHO_PLUGIN_WANT_MIDI_INPUT uint32_t midiEventCount = 0; for (uint32_t i=0; i < dpfMidiEventCount; ++i) { @@ -426,20 +430,20 @@ protected: if (++midiEventCount == kMaxMidiEventCount) break; } -# if DISTRHO_PLUGIN_WANT_MIDI_OUTPUT - fCarlaPluginDescriptor->process(fCarlaPluginHandle, fDummyBuffers, fDummyBuffers, frames, - fMidiEvents, midiEventCount); - // unused - (void)outputs; -# else - fCarlaPluginDescriptor->process(fCarlaPluginHandle, fDummyBuffers, outputs, frames, + #else + static constexpr const* NativeMidiEvent fMidiEvents = nullptr; + static constexpr const uint32_t midiEventCount = 0; + #endif + + #if DISTRHO_PLUGIN_NUM_INPUTS == 0 + inputs = fDummyBuffers; + #endif + #if DISTRHO_PLUGIN_NUM_INPUTS == 0 + outputs = fDummyBuffers; + #endif + + fCarlaPluginDescriptor->process(fCarlaPluginHandle, (float**)inputs, outputs, frames, fMidiEvents, midiEventCount); -# endif - // unused - (void)inputs; -#else - fCarlaPluginDescriptor->process(fCarlaPluginHandle, (float**)inputs, outputs, frames, nullptr, 0); -#endif checkLatencyChanged(); } diff --git a/plugins/Common/Makefile.mk b/plugins/Common/Makefile.mk index 067928f..d94c587 100644 --- a/plugins/Common/Makefile.mk +++ b/plugins/Common/Makefile.mk @@ -81,12 +81,13 @@ include ../../dpf/Makefile.plugins.mk ifeq ($(WASM),true) # used for testing LINK_FLAGS += -sALLOW_MEMORY_GROWTH +LINK_FLAGS += --use-preload-cache LINK_FLAGS += --use-preload-plugins # LINK_FLAGS += --preload-file=foolme.mp3 # LINK_FLAGS += --preload-file=furelise.mid # LINK_FLAGS += --preload-file=./jsfx LINK_FLAGS += --preload-file=./lv2 -# LINK_FLAGS += --shell-file=../Cardinal/src/emscripten/shell.html +LINK_FLAGS += --shell-file=./emscripten/shell.html else ifneq ($(HAIKU),true) BUILD_CXX_FLAGS += -pthread endif diff --git a/plugins/Standalone/emscripten/shell.html b/plugins/Standalone/emscripten/shell.html new file mode 100644 index 0000000..1c18aba --- /dev/null +++ b/plugins/Standalone/emscripten/shell.html @@ -0,0 +1,192 @@ + + + + + + + + + Ildaeil + + + +
+
+
Ildaeil
+
+
+
Downloading...
+
+ +
+
+ + +
+ + + {{{ SCRIPT }}} + +