Browse Source

Merge branch 'DISTRHO:main' into feature/add-starling-via

pull/173/head
dreamer GitHub 1 year ago
parent
commit
899b33087d
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
16 changed files with 28 additions and 48 deletions
  1. +5
    -4
      .github/workflows/build.yml
  2. +1
    -1
      carla
  3. +2
    -1
      deps/Makefile
  4. +1
    -1
      deps/PawPaw
  5. +1
    -1
      dpf
  6. +2
    -16
      include/settings.hpp
  7. +1
    -1
      plugins/AnimatedCircuits
  8. +1
    -1
      plugins/GlueTheGiant
  9. +1
    -1
      plugins/Prism
  10. +1
    -1
      plugins/RebelTech
  11. +1
    -1
      plugins/Sapphire
  12. +4
    -0
      plugins/plugins.cpp
  13. +1
    -1
      plugins/stoermelder-packone
  14. +1
    -1
      plugins/surgext
  15. +5
    -15
      src/CardinalCommon.hpp
  16. +0
    -2
      src/custom/dep.cpp

+ 5
- 4
.github/workflows/build.yml View File

@@ -3,11 +3,12 @@ name: build
on: [push, pull_request] on: [push, pull_request]


env: env:
CACHE_VERSION: 7
CACHE_VERSION: 9
CARDINAL_UNDER_WINE: 1 CARDINAL_UNDER_WINE: 1
CIBUILD: true CIBUILD: true
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
LIBGL_ALWAYS_SOFTWARE: true LIBGL_ALWAYS_SOFTWARE: true
PAWPAW_FAST_MATH: 1
PAWPAW_SKIP_GLIB: 1 PAWPAW_SKIP_GLIB: 1
PAWPAW_SKIP_LTO: 1 PAWPAW_SKIP_LTO: 1
PAWPAW_SKIP_LV2: 1 PAWPAW_SKIP_LV2: 1
@@ -600,7 +601,7 @@ jobs:
LDFLAGS: -static-libgcc -static-libstdc++ LDFLAGS: -static-libgcc -static-libstdc++
run: | run: |
make features make features
make NOOPT=true SKIP_STRIPPING=true carla deps dgl plugins resources -j $(nproc)
make CIBUILD=false NOOPT=true SKIP_STRIPPING=true carla deps dgl plugins resources -j $(nproc)
# single job for final build stage, otherwise we might get killed due to OOM # single job for final build stage, otherwise we might get killed due to OOM
- name: Build Cardinal (final build stage) - name: Build Cardinal (final build stage)
env: env:
@@ -609,8 +610,8 @@ jobs:
LDFLAGS: -static-libgcc -static-libstdc++ LDFLAGS: -static-libgcc -static-libstdc++
run: | run: |
make features make features
make NOOPT=true SKIP_STRIPPING=true -j 1 -C src jack
make NOOPT=true -j 1
make CIBUILD=false NOOPT=true SKIP_STRIPPING=true -j 1 -C src jack
make CIBUILD=false NOOPT=true -j 1
./dpf/utils/generate-ttl.sh ./dpf/utils/generate-ttl.sh
- name: Run Cardinal self-tests - name: Run Cardinal self-tests
run: | run: |


+ 1
- 1
carla

@@ -1 +1 @@
Subproject commit fe8631bc13a507507ccc6b5c408d5a4a880b1936
Subproject commit 66afe24a08790732cc17d81d4b846a1e0cfa0118

+ 2
- 1
deps/Makefile View File

@@ -286,12 +286,13 @@ SURGE_ENV = env \
SURGE_LIB = $(SURGE_DEP_PATH)/src/common/libsurge-common.a SURGE_LIB = $(SURGE_DEP_PATH)/src/common/libsurge-common.a


$(SURGE_LIB): $(SURGE_DEP_PATH)/Makefile $(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 $(SURGE_DEP_PATH)/Makefile: $(SURGE_SRC_PATH)/CMakeLists.txt
mkdir -p $(SURGE_DEP_PATH) mkdir -p $(SURGE_DEP_PATH)
cd $(SURGE_DEP_PATH) && \ cd $(SURGE_DEP_PATH) && \
$(SURGE_ENV) $(CMAKE) \ $(SURGE_ENV) $(CMAKE) \
-DSURGE_BUILD_32BIT_LINUX=TRUE \
-DSURGE_COMPILE_BLOCK_SIZE=8 \ -DSURGE_COMPILE_BLOCK_SIZE=8 \
-DSURGE_SKIP_AIRWINDOWS=TRUE \ -DSURGE_SKIP_AIRWINDOWS=TRUE \
-DSURGE_SKIP_JUCE_FOR_RACK=TRUE \ -DSURGE_SKIP_JUCE_FOR_RACK=TRUE \


+ 1
- 1
deps/PawPaw

@@ -1 +1 @@
Subproject commit cfa9dc50b32ebdb567d2d86467d3dc58157252c7
Subproject commit 777177562ef39836b9e0963e7910d55e3d2d0636

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit fb0e7bff261b3a28dd1ce3f3604e30afb7c1dcb8
Subproject commit 0ceb411fde5192ad4aaa1c89b079a861e4dac5df

+ 2
- 16
include/settings.hpp View File

@@ -1,18 +1,7 @@
/* /*
* DISTRHO Cardinal Plugin * DISTRHO Cardinal Plugin
* Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
*
* 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 <falktx@falktx.com>
* SPDX-License-Identifier: GPL-3.0-or-later
*/ */


#pragma once #pragma once
@@ -24,8 +13,5 @@ namespace settings {


extern int rateLimit; extern int rateLimit;


// TODO remove after updating all plugins
extern bool darkMode;

} // namespace settings } // namespace settings
} // namespace rack } // namespace rack

+ 1
- 1
plugins/AnimatedCircuits

@@ -1 +1 @@
Subproject commit bf78cd8ed22970fe9dc5ebff8e3907898904c747
Subproject commit 65f1f203884f13a5eb8cccfae81c751de68d437f

+ 1
- 1
plugins/GlueTheGiant

@@ -1 +1 @@
Subproject commit 7e20713eacc51179cd7faf0f4428def2b82273a9
Subproject commit d40d707fc76fbbdada64ce4d4a64b4f2fbd7e865

+ 1
- 1
plugins/Prism

@@ -1 +1 @@
Subproject commit 8d2796da76e5d7f79bbf461c95a7858035bb0736
Subproject commit 16a80544d0389db9c1225c4ed1e29e5f47306a01

+ 1
- 1
plugins/RebelTech

@@ -1 +1 @@
Subproject commit 2d06199dd36ecdfe33d640ed1602f1041930f013
Subproject commit 6f610187ffb2a9707035a63706effe00335fe7f6

+ 1
- 1
plugins/Sapphire

@@ -1 +1 @@
Subproject commit 9d9d3ae703259b55a2734e03a9421874ebd35cf9
Subproject commit 4bf2ad39eeaddcbfcc5cd345aef8c0c4cc722b73

+ 4
- 0
plugins/plugins.cpp View File

@@ -2907,8 +2907,12 @@ static void initStatic__Sapphire()
p->addModel(modelElastika); p->addModel(modelElastika);
p->addModel(modelFrolic); p->addModel(modelFrolic);
p->addModel(modelGlee); p->addModel(modelGlee);
p->addModel(modelHiss);
p->addModel(modelMoots); p->addModel(modelMoots);
p->addModel(modelNucleus);
p->addModel(modelPolynucleus);
p->addModel(modelTin); p->addModel(modelTin);
p->addModel(modelTout);
p->addModel(modelTricorder); p->addModel(modelTricorder);
p->addModel(modelTubeUnit); p->addModel(modelTubeUnit);
} }


+ 1
- 1
plugins/stoermelder-packone

@@ -1 +1 @@
Subproject commit ec3c0972440edddfb00d5e5ad189f345c68be471
Subproject commit 851efdf426b36a77c5099a8286a6e58f46b9d20c

+ 1
- 1
plugins/surgext

@@ -1 +1 @@
Subproject commit 183a50590aa587ec4e4a6a35f857f63a25ab86ff
Subproject commit cbebb2b5d5d6b5dc865660fb3ef54d2c35bfa0f1

+ 5
- 15
src/CardinalCommon.hpp View File

@@ -1,18 +1,7 @@
/* /*
* DISTRHO Cardinal Plugin * DISTRHO Cardinal Plugin
* Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
*
* 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 <falktx@falktx.com>
* SPDX-License-Identifier: GPL-3.0-or-later
*/ */


#pragma once #pragma once
@@ -87,8 +76,9 @@ void openBrowser(const std::string& url);
# define CARDINAL_INIT_OSC_THREAD # define CARDINAL_INIT_OSC_THREAD
#endif #endif


typedef void* lo_server;
typedef void* lo_server_thread;
#ifdef HAVE_LIBLO
# include <lo/lo_types.h>
#endif


START_NAMESPACE_DISTRHO START_NAMESPACE_DISTRHO




+ 0
- 2
src/custom/dep.cpp View File

@@ -19,7 +19,6 @@ namespace settings {
int rateLimit = 0; int rateLimit = 0;
extern bool preferDarkPanels; extern bool preferDarkPanels;
extern std::string uiTheme; extern std::string uiTheme;
bool darkMode; // TODO remove after updating all plugins
} }
namespace ui { namespace ui {
void refreshTheme(); void refreshTheme();
@@ -1451,7 +1450,6 @@ namespace rack {
void switchDarkMode(const bool darkMode) void switchDarkMode(const bool darkMode)
{ {
#ifndef HEADLESS #ifndef HEADLESS
settings::darkMode = darkMode; // TODO remove after updating all plugins
settings::preferDarkPanels = darkMode; settings::preferDarkPanels = darkMode;
settings::uiTheme = darkMode ? "dark" : "light"; settings::uiTheme = darkMode ? "dark" : "light";
ui::refreshTheme(); ui::refreshTheme();


Loading…
Cancel
Save