diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55455919e..af3ff6758 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,8 +12,8 @@ env: HOMEBREW_NO_AUTO_UPDATE: 1 jobs: - macos-10_15: - runs-on: macos-10.15 + macos-11: + runs-on: macos-11 steps: - uses: actions/checkout@v2 - name: Set up dependencies diff --git a/source/backend/utils/Makefile b/source/backend/utils/Makefile index fcb38397e..238274bf0 100644 --- a/source/backend/utils/Makefile +++ b/source/backend/utils/Makefile @@ -28,6 +28,7 @@ TARGETS = $(BINDIR)/libcarla_utils$(LIB_EXT) LIBS = $(MODULEDIR)/lilv.a LIBS += $(MODULEDIR)/water.files.a +LIBS += $(MODULEDIR)/ysfx.a ifeq ($(USING_JUCE),true) LIBS += $(MODULEDIR)/carla_juce.a @@ -43,6 +44,7 @@ endif LINK_FLAGS += $(LILV_LIBS) LINK_FLAGS += $(WATER_LIBS) +LINK_FLAGS += $(YSFX_GRAPHICS_LIBS) ifeq ($(HAVE_X11),true) LINK_FLAGS += $(X11_LIBS) @@ -65,9 +67,6 @@ LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS) LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS) endif -LINK_FLAGS += $(MODULEDIR)/ysfx.a -LINK_FLAGS += $(YSFX_GRAPHICS_LIBS) - # --------------------------------------------------------------------------------------------------------------------- all: $(TARGETS) diff --git a/source/frontend/carla_frontend.cpp b/source/frontend/carla_frontend.cpp new file mode 100644 index 000000000..922044793 --- /dev/null +++ b/source/frontend/carla_frontend.cpp @@ -0,0 +1,39 @@ +/* + * Carla Plugin Host + * Copyright (C) 2011-2022 Filipe Coelho + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * For a full copy of the GNU General Public License see the doc/GPL.txt file. + */ + +#include "CarlaBackend.h" +#include "CarlaUtils.hpp" + +namespace CB = CARLA_BACKEND_NAMESPACE; + +// ------------------------------------------------------------------------------------------------------------------- + +struct WidgetResult { + union { + struct { + const char* command; + const char* name; + const char* labelSetup; + } jackappdialog; + }; +}; + +CARLA_PLUGIN_EXPORT void* carla_frontend_create_widget(void* parent, const char* widgetType); + +CARLA_PLUGIN_EXPORT void* carla_frontend_get_result(void* widget, const char* widgetType); + +// -------------------------------------------------------------------------------------------------------------------