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

Update to latest carla, dpf, and pugl, needs testing

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-05-28 03:06:41 +01:00
parent 11d9d6a0be
commit bcd1b9e273
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
7 changed files with 19 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -199,7 +199,9 @@ carla:
ifneq ($(STATIC_BUILD),true)
$(MAKE) static-plugin -C carla $(CARLA_EXTRA_ARGS) \
CAN_GENERATE_LV2_TTL=false \
STATIC_PLUGIN_TARGET=true
CUSTOM_DPF_PATH=$(CURDIR)/dpf \
STATIC_PLUGIN_TARGET=true \
USING_CUSTOM_DPF=true
endif
deps:

2
carla

@ -1 +1 @@
Subproject commit 8371c3c395e6e4d9d34ea2b0f7e5557eb0171a7a
Subproject commit 36beab5b13b39744b7dc23a2bef57b02756b39ec

2
dpf

@ -1 +1 @@
Subproject commit 01fc1622154ed931ccb4e15ebf3dbb9625747c63
Subproject commit 114031ee99257b7c02cfc66cf01d56bef3c6d315

6
jucewrapper/CMakeLists.txt
View file

@ -28,9 +28,6 @@ set_property(TARGET native_plugins PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_
add_library(audio_decoder STATIC IMPORTED)
set_property(TARGET audio_decoder PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/Release/audio_decoder.a")
add_library(carla_dgl STATIC IMPORTED)
set_property(TARGET carla_dgl PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/Release/dgl.a")
add_library(jackbridge STATIC IMPORTED)
set_property(TARGET jackbridge PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/Release/jackbridge.min.a")
@ -173,7 +170,6 @@ target_link_libraries(Cardinal
carla_plugin
native_plugins
audio_decoder
carla_dgl
jackbridge
lilv
rtmempool
@ -264,7 +260,6 @@ target_link_libraries(CardinalFX
carla_plugin
native_plugins
audio_decoder
carla_dgl
jackbridge
lilv
rtmempool
@ -355,7 +350,6 @@ target_link_libraries(CardinalSynth
carla_plugin
native_plugins
audio_decoder
carla_dgl
jackbridge
lilv
rtmempool

2
plugins/Cardinal/src/plugincontext.hpp
View file

@ -21,7 +21,7 @@
#include "DistrhoUtils.hpp"
#ifndef HEADLESS
# include "dgl/Base.hpp"
# include "../dgl/Base.hpp"
#else
# include "extra/LeakDetector.hpp"
#endif

30
src/CardinalUI.cpp
View file

@ -47,17 +47,8 @@ GLFWAPI const char* glfwGetClipboardString(GLFWwindow*)
DISTRHO_SAFE_ASSERT_RETURN(context != nullptr, nullptr);
DISTRHO_SAFE_ASSERT_RETURN(context->ui != nullptr, nullptr);
const char* mimeType = nullptr;
size_t dataSize = 0;
if (const void* const clipboard = context->ui->getClipboard(mimeType, dataSize))
{
if (mimeType == nullptr || std::strcmp(mimeType, "text/plain") != 0)
return nullptr;
return static_cast<const char*>(clipboard);
}
return nullptr;
size_t dataSize;
return static_cast<const char*>(context->ui->getClipboard(dataSize));
}
GLFWAPI void glfwSetClipboardString(GLFWwindow*, const char* const text)
@ -268,7 +259,6 @@ class CardinalUI : public CardinalBaseUI,
{
if (context->window != nullptr)
WindowParametersSave(context->window);
rack::contextSet(nullptr);
}
};
@ -619,13 +609,8 @@ protected:
switch (ev.button)
{
case 1: button = GLFW_MOUSE_BUTTON_LEFT; break;
#ifdef DISTRHO_OS_MAC
case 2: button = GLFW_MOUSE_BUTTON_RIGHT; break;
case 3: button = GLFW_MOUSE_BUTTON_MIDDLE; break;
#else
case 2: button = GLFW_MOUSE_BUTTON_MIDDLE; break;
case 3: button = GLFW_MOUSE_BUTTON_RIGHT; break;
#endif
default:
button = ev.button;
break;
@ -778,6 +763,17 @@ protected:
setState("windowSize", sizeString);
}
uint32_t uiClipboardDataOffer() override
{
const std::vector<ClipboardDataOffer> offers(getClipboardDataOfferTypes());
for (const ClipboardDataOffer offer : offers)
if (std::strcmp(offer.type, "text/plain") == 0)
return offer.id;
return 0;
}
void uiFocus(const bool focus, const CrossingMode mode) override
{
if (focus)

3
src/Makefile.cardinal.mk
View file

@ -38,9 +38,6 @@ CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_engine_
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_plugin.a
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/native-plugins.a
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/audio_decoder.a
ifneq ($(HEADLESS),true)
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/dgl.a
endif
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/jackbridge.min.a
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/lilv.a
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/rtmempool.a