Stop using cardinal-specific settings::darkMode

Signed-off-by: falkTX <[email protected]>
DISTRHO · Mar 9, 2024 · 32e7f7c · 32e7f7c
1 parent 68b1a6c
commit 32e7f7c
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 40 deletions.
diff --git 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
diff --git a/include/settings.hpp b/include/settings.hpp
@@ -1,18 +1,7 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021-2023 Filipe Coelho <[email protected]>
- *
- * 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 <[email protected]>
+ * 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
diff --git a/plugins/GlueTheGiant b/plugins/GlueTheGiant
diff --git a/plugins/Prism b/plugins/Prism
diff --git a/plugins/RebelTech b/plugins/RebelTech
diff --git a/plugins/stoermelder-packone b/plugins/stoermelder-packone
diff --git a/src/CardinalCommon.hpp b/src/CardinalCommon.hpp
@@ -1,18 +1,7 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021-2023 Filipe Coelho <[email protected]>
- *
- * 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 <[email protected]>
+ * 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 <lo/lo_types.h>
+#endif
 
 START_NAMESPACE_DISTRHO
 

diff --git 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();
+3 −3		src/Folding/FoldingWidget.cpp
+3 −3		src/LFold/LFoldWidget.cpp
+1 −1		plugin.json
+2 −2		src/BusDepot.cpp
+2 −2		src/BusRoute.cpp
+2 −2		src/EnterBus.cpp
+2 −2		src/ExitBus.cpp
+2 −2		src/GigBus.cpp
+2 −2		src/MetroCityBus.cpp
+2 −2		src/MiniBus.cpp
+2 −2		src/Road.cpp
+2 −2		src/SchoolBus.cpp
+111 −50		.github/workflows/build-plugin.yml
+4 −0		.gitignore
+1 −0		.sonarcloud.properties
+0 −2		README.md
+ −		doc/SMR-manual-1.1.1.pdf
+1 −1		plugin.json
+179 −473		res/RainbowScaleExpander.svg
+11 −28		src/Common.hpp
+22 −28		src/Droplet.hpp
+1 −7		src/Filter.cpp
+1 −2		src/Inputs.cpp
+3 −3		src/LPF.cpp
+27 −63		src/Rainbow.cpp
+126 −166		src/Rainbow.hpp
+53 −74		src/RainbowExpander.cpp
+6 −10		src/Rotation.cpp