diff --git a/deps/Makefile b/deps/Makefile index 5e706518..e0b63ff9 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -286,7 +286,7 @@ SURGE_ENV = env \ SURGE_LIB = $(SURGE_DEP_PATH)/src/common/libsurge-common.a $(SURGE_LIB): $(SURGE_DEP_PATH)/Makefile - $(DEP_MAKE) -C $(SURGE_DEP_PATH) surge-common + +$(DEP_MAKE) -C $(SURGE_DEP_PATH) surge-common $(SURGE_DEP_PATH)/Makefile: $(SURGE_SRC_PATH)/CMakeLists.txt mkdir -p $(SURGE_DEP_PATH) diff --git a/dpf b/dpf index 311bc24f..564a4774 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 311bc24f3bfb44c3297a23839cd8dbae3b63e83b +Subproject commit 564a47745b584c94892a122066d76843af4b4200 diff --git a/include/settings.hpp b/include/settings.hpp index 13b40e13..317c4989 100644 --- a/include/settings.hpp +++ b/include/settings.hpp @@ -1,18 +1,7 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2023 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 3 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 LICENSE file. + * Copyright (C) 2021-2024 Filipe Coelho + * SPDX-License-Identifier: GPL-3.0-or-later */ #pragma once @@ -24,8 +13,5 @@ namespace settings { extern int rateLimit; -// TODO remove after updating all plugins -extern bool darkMode; - } // namespace settings } // namespace rack diff --git a/plugins/AnimatedCircuits b/plugins/AnimatedCircuits index bf78cd8e..65f1f203 160000 --- a/plugins/AnimatedCircuits +++ b/plugins/AnimatedCircuits @@ -1 +1 @@ -Subproject commit bf78cd8ed22970fe9dc5ebff8e3907898904c747 +Subproject commit 65f1f203884f13a5eb8cccfae81c751de68d437f diff --git a/plugins/GlueTheGiant b/plugins/GlueTheGiant index 7e20713e..d40d707f 160000 --- a/plugins/GlueTheGiant +++ b/plugins/GlueTheGiant @@ -1 +1 @@ -Subproject commit 7e20713eacc51179cd7faf0f4428def2b82273a9 +Subproject commit d40d707fc76fbbdada64ce4d4a64b4f2fbd7e865 diff --git a/plugins/Prism b/plugins/Prism index 8d2796da..16a80544 160000 --- a/plugins/Prism +++ b/plugins/Prism @@ -1 +1 @@ -Subproject commit 8d2796da76e5d7f79bbf461c95a7858035bb0736 +Subproject commit 16a80544d0389db9c1225c4ed1e29e5f47306a01 diff --git a/plugins/RebelTech b/plugins/RebelTech index 2d06199d..6f610187 160000 --- a/plugins/RebelTech +++ b/plugins/RebelTech @@ -1 +1 @@ -Subproject commit 2d06199dd36ecdfe33d640ed1602f1041930f013 +Subproject commit 6f610187ffb2a9707035a63706effe00335fe7f6 diff --git a/plugins/stoermelder-packone b/plugins/stoermelder-packone index ec3c0972..851efdf4 160000 --- a/plugins/stoermelder-packone +++ b/plugins/stoermelder-packone @@ -1 +1 @@ -Subproject commit ec3c0972440edddfb00d5e5ad189f345c68be471 +Subproject commit 851efdf426b36a77c5099a8286a6e58f46b9d20c diff --git a/src/CardinalCommon.hpp b/src/CardinalCommon.hpp index 756f02dd..653b506d 100644 --- a/src/CardinalCommon.hpp +++ b/src/CardinalCommon.hpp @@ -1,18 +1,7 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2023 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 3 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 LICENSE file. + * Copyright (C) 2021-2024 Filipe Coelho + * SPDX-License-Identifier: GPL-3.0-or-later */ #pragma once @@ -87,8 +76,9 @@ void openBrowser(const std::string& url); # define CARDINAL_INIT_OSC_THREAD #endif -typedef void* lo_server; -typedef void* lo_server_thread; +#ifdef HAVE_LIBLO +# include +#endif START_NAMESPACE_DISTRHO diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp index 398086e2..abbb0d99 100644 --- a/src/custom/dep.cpp +++ b/src/custom/dep.cpp @@ -19,7 +19,6 @@ namespace settings { int rateLimit = 0; extern bool preferDarkPanels; extern std::string uiTheme; -bool darkMode; // TODO remove after updating all plugins } namespace ui { void refreshTheme(); @@ -1451,7 +1450,6 @@ namespace rack { void switchDarkMode(const bool darkMode) { #ifndef HEADLESS - settings::darkMode = darkMode; // TODO remove after updating all plugins settings::preferDarkPanels = darkMode; settings::uiTheme = darkMode ? "dark" : "light"; ui::refreshTheme();