From 06495044a5d2474d3cc390eb8d2b07ea4a48bbe2 Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 18 Apr 2023 15:02:13 -0400 Subject: [PATCH] Remove the now moribund Synth/Editor extensions (#6955) Used to be we needed custom doo-hickies for each synth type but now we are on juce 7 we don't, so remove this somewhat clumsy link time mechanism. Closes #6950 --- src/surge-xt/CMakeLists.txt | 5 ---- src/surge-xt/SurgeSynthEditor.cpp | 3 --- src/surge-xt/SurgeSynthProcessor.cpp | 3 --- .../SurgeSynthAUExtensions.cpp | 23 ------------------- .../SurgeSynthAUv3Extensions.cpp | 23 ------------------- .../SurgeSynthClapExtensions.cpp | 23 ------------------- .../SurgeSynthFlavorExtensions.h | 22 ------------------ .../SurgeSynthLV2Extensions.cpp | 23 ------------------- .../SurgeSynthStandaloneExtensions.cpp | 23 ------------------- .../SurgeSynthVST3Extensions.cpp | 23 ------------------- .../SurgeSynthVSTExtensions.cpp | 23 ------------------- 11 files changed, 194 deletions(-) delete mode 100644 src/surge-xt/plugin_type_extensions/SurgeSynthAUExtensions.cpp delete mode 100644 src/surge-xt/plugin_type_extensions/SurgeSynthAUv3Extensions.cpp delete mode 100644 src/surge-xt/plugin_type_extensions/SurgeSynthClapExtensions.cpp delete mode 100644 src/surge-xt/plugin_type_extensions/SurgeSynthFlavorExtensions.h delete mode 100644 src/surge-xt/plugin_type_extensions/SurgeSynthLV2Extensions.cpp delete mode 100644 src/surge-xt/plugin_type_extensions/SurgeSynthStandaloneExtensions.cpp delete mode 100644 src/surge-xt/plugin_type_extensions/SurgeSynthVST3Extensions.cpp delete mode 100644 src/surge-xt/plugin_type_extensions/SurgeSynthVSTExtensions.cpp diff --git a/src/surge-xt/CMakeLists.txt b/src/surge-xt/CMakeLists.txt index 130ba5dc1d7..7bb004a6107 100644 --- a/src/surge-xt/CMakeLists.txt +++ b/src/surge-xt/CMakeLists.txt @@ -57,7 +57,6 @@ if(SURGE_BUILD_CLAP) clap_juce_extensions_plugin(TARGET surge-xt CLAP_ID "org.surge-synth-team.surge-xt" CLAP_FEATURES "instrument" "synthesizer" "hybrid" "free and open source") - target_sources(${PROJECT_NAME}_CLAP PRIVATE plugin_type_extensions/SurgeSynthClapExtensions.cpp) endif() if(JUCE_ASIO_SUPPORT) @@ -193,10 +192,6 @@ target_compile_definitions(${PROJECT_NAME} PUBLIC $,BUILD_IS_DEBUG,BUILD_IS_RELEASE>=1 ) -foreach(format ${SURGE_JUCE_FORMATS}) - target_sources(${PROJECT_NAME}_${format} PRIVATE plugin_type_extensions/SurgeSynth${format}Extensions.cpp) -endforeach() - target_link_libraries(${PROJECT_NAME} PRIVATE surge-common surge-platform diff --git a/src/surge-xt/SurgeSynthEditor.cpp b/src/surge-xt/SurgeSynthEditor.cpp index 5d2964eb70f..61a3f44f370 100644 --- a/src/surge-xt/SurgeSynthEditor.cpp +++ b/src/surge-xt/SurgeSynthEditor.cpp @@ -13,7 +13,6 @@ #include "SurgeImageStore.h" #include "SurgeImage.h" #include "SurgeGUIEditor.h" -#include "plugin_type_extensions/SurgeSynthFlavorExtensions.h" #include "SurgeJUCELookAndFeel.h" #include "RuntimeFont.h" #include "AccessibleHelpers.h" @@ -221,8 +220,6 @@ SurgeSynthEditor::SurgeSynthEditor(SurgeSynthProcessor &p) idleTimer = std::make_unique(this); idleTimer->startTimer(1000 / 60); - - SurgeSynthEditorSpecificExtensions(this, sge.get()); } SurgeSynthEditor::~SurgeSynthEditor() diff --git a/src/surge-xt/SurgeSynthProcessor.cpp b/src/surge-xt/SurgeSynthProcessor.cpp index 849244f5d86..31c9959a9be 100644 --- a/src/surge-xt/SurgeSynthProcessor.cpp +++ b/src/surge-xt/SurgeSynthProcessor.cpp @@ -11,7 +11,6 @@ #include "SurgeSynthEditor.h" #include "SurgeSynthProcessor.h" #include "DebugHelpers.h" -#include "plugin_type_extensions/SurgeSynthFlavorExtensions.h" #include "version.h" #include "sst/plugininfra/cpufeatures.h" #include "globals.h" @@ -141,8 +140,6 @@ SurgeSynthProcessor::SurgeSynthProcessor() } } #endif - - SurgeSynthProcessorSpecificExtensions(this, surge.get()); } SurgeSynthProcessor::~SurgeSynthProcessor() {} diff --git a/src/surge-xt/plugin_type_extensions/SurgeSynthAUExtensions.cpp b/src/surge-xt/plugin_type_extensions/SurgeSynthAUExtensions.cpp deleted file mode 100644 index 7f76b505155..00000000000 --- a/src/surge-xt/plugin_type_extensions/SurgeSynthAUExtensions.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* -** Surge Synthesizer is Free and Open Source Software -** -** Surge is made available under the Gnu General Public License, v3.0 -** https://www.gnu.org/licenses/gpl-3.0.en.html -** -** Copyright 2004-2020 by various individuals as described by the Git transaction log -** -** All source at: https://github.com/surge-synthesizer/surge.git -** -** Surge was a commercial product from 2004-2018, with Copyright and ownership -** in that period held by Claes Johanson at Vember Audio. Claes made Surge -** open source in September 2018. -*/ - -#include - -#include "SurgeSynthProcessor.h" -#include "SurgeSynthEditor.h" -#include "SurgeSynthFlavorExtensions.h" - -void SurgeSynthProcessorSpecificExtensions(SurgeSynthProcessor *p, SurgeSynthesizer *s) {} -void SurgeSynthEditorSpecificExtensions(SurgeSynthEditor *e, SurgeGUIEditor *sed) {} diff --git a/src/surge-xt/plugin_type_extensions/SurgeSynthAUv3Extensions.cpp b/src/surge-xt/plugin_type_extensions/SurgeSynthAUv3Extensions.cpp deleted file mode 100644 index 7f76b505155..00000000000 --- a/src/surge-xt/plugin_type_extensions/SurgeSynthAUv3Extensions.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* -** Surge Synthesizer is Free and Open Source Software -** -** Surge is made available under the Gnu General Public License, v3.0 -** https://www.gnu.org/licenses/gpl-3.0.en.html -** -** Copyright 2004-2020 by various individuals as described by the Git transaction log -** -** All source at: https://github.com/surge-synthesizer/surge.git -** -** Surge was a commercial product from 2004-2018, with Copyright and ownership -** in that period held by Claes Johanson at Vember Audio. Claes made Surge -** open source in September 2018. -*/ - -#include - -#include "SurgeSynthProcessor.h" -#include "SurgeSynthEditor.h" -#include "SurgeSynthFlavorExtensions.h" - -void SurgeSynthProcessorSpecificExtensions(SurgeSynthProcessor *p, SurgeSynthesizer *s) {} -void SurgeSynthEditorSpecificExtensions(SurgeSynthEditor *e, SurgeGUIEditor *sed) {} diff --git a/src/surge-xt/plugin_type_extensions/SurgeSynthClapExtensions.cpp b/src/surge-xt/plugin_type_extensions/SurgeSynthClapExtensions.cpp deleted file mode 100644 index 7f76b505155..00000000000 --- a/src/surge-xt/plugin_type_extensions/SurgeSynthClapExtensions.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* -** Surge Synthesizer is Free and Open Source Software -** -** Surge is made available under the Gnu General Public License, v3.0 -** https://www.gnu.org/licenses/gpl-3.0.en.html -** -** Copyright 2004-2020 by various individuals as described by the Git transaction log -** -** All source at: https://github.com/surge-synthesizer/surge.git -** -** Surge was a commercial product from 2004-2018, with Copyright and ownership -** in that period held by Claes Johanson at Vember Audio. Claes made Surge -** open source in September 2018. -*/ - -#include - -#include "SurgeSynthProcessor.h" -#include "SurgeSynthEditor.h" -#include "SurgeSynthFlavorExtensions.h" - -void SurgeSynthProcessorSpecificExtensions(SurgeSynthProcessor *p, SurgeSynthesizer *s) {} -void SurgeSynthEditorSpecificExtensions(SurgeSynthEditor *e, SurgeGUIEditor *sed) {} diff --git a/src/surge-xt/plugin_type_extensions/SurgeSynthFlavorExtensions.h b/src/surge-xt/plugin_type_extensions/SurgeSynthFlavorExtensions.h deleted file mode 100644 index 0f95c225315..00000000000 --- a/src/surge-xt/plugin_type_extensions/SurgeSynthFlavorExtensions.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -** Surge Synthesizer is Free and Open Source Software -** -** Surge is made available under the Gnu General Public License, v3.0 -** https://www.gnu.org/licenses/gpl-3.0.en.html -** -** Copyright 2004-2020 by various individuals as described by the Git transaction log -** -** All source at: https://github.com/surge-synthesizer/surge.git -** -** Surge was a commercial product from 2004-2018, with Copyright and ownership -** in that period held by Claes Johanson at Vember Audio. Claes made Surge -** open source in September 2018. -*/ - -class SurgeSynthProcessor; -class SurgeSynthEditor; -class SurgeSynthesizer; -class SurgeGUIEditor; - -void SurgeSynthProcessorSpecificExtensions(SurgeSynthProcessor *p, SurgeSynthesizer *s); -void SurgeSynthEditorSpecificExtensions(SurgeSynthEditor *e, SurgeGUIEditor *sed); \ No newline at end of file diff --git a/src/surge-xt/plugin_type_extensions/SurgeSynthLV2Extensions.cpp b/src/surge-xt/plugin_type_extensions/SurgeSynthLV2Extensions.cpp deleted file mode 100644 index 7f76b505155..00000000000 --- a/src/surge-xt/plugin_type_extensions/SurgeSynthLV2Extensions.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* -** Surge Synthesizer is Free and Open Source Software -** -** Surge is made available under the Gnu General Public License, v3.0 -** https://www.gnu.org/licenses/gpl-3.0.en.html -** -** Copyright 2004-2020 by various individuals as described by the Git transaction log -** -** All source at: https://github.com/surge-synthesizer/surge.git -** -** Surge was a commercial product from 2004-2018, with Copyright and ownership -** in that period held by Claes Johanson at Vember Audio. Claes made Surge -** open source in September 2018. -*/ - -#include - -#include "SurgeSynthProcessor.h" -#include "SurgeSynthEditor.h" -#include "SurgeSynthFlavorExtensions.h" - -void SurgeSynthProcessorSpecificExtensions(SurgeSynthProcessor *p, SurgeSynthesizer *s) {} -void SurgeSynthEditorSpecificExtensions(SurgeSynthEditor *e, SurgeGUIEditor *sed) {} diff --git a/src/surge-xt/plugin_type_extensions/SurgeSynthStandaloneExtensions.cpp b/src/surge-xt/plugin_type_extensions/SurgeSynthStandaloneExtensions.cpp deleted file mode 100644 index 7f76b505155..00000000000 --- a/src/surge-xt/plugin_type_extensions/SurgeSynthStandaloneExtensions.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* -** Surge Synthesizer is Free and Open Source Software -** -** Surge is made available under the Gnu General Public License, v3.0 -** https://www.gnu.org/licenses/gpl-3.0.en.html -** -** Copyright 2004-2020 by various individuals as described by the Git transaction log -** -** All source at: https://github.com/surge-synthesizer/surge.git -** -** Surge was a commercial product from 2004-2018, with Copyright and ownership -** in that period held by Claes Johanson at Vember Audio. Claes made Surge -** open source in September 2018. -*/ - -#include - -#include "SurgeSynthProcessor.h" -#include "SurgeSynthEditor.h" -#include "SurgeSynthFlavorExtensions.h" - -void SurgeSynthProcessorSpecificExtensions(SurgeSynthProcessor *p, SurgeSynthesizer *s) {} -void SurgeSynthEditorSpecificExtensions(SurgeSynthEditor *e, SurgeGUIEditor *sed) {} diff --git a/src/surge-xt/plugin_type_extensions/SurgeSynthVST3Extensions.cpp b/src/surge-xt/plugin_type_extensions/SurgeSynthVST3Extensions.cpp deleted file mode 100644 index 7f76b505155..00000000000 --- a/src/surge-xt/plugin_type_extensions/SurgeSynthVST3Extensions.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* -** Surge Synthesizer is Free and Open Source Software -** -** Surge is made available under the Gnu General Public License, v3.0 -** https://www.gnu.org/licenses/gpl-3.0.en.html -** -** Copyright 2004-2020 by various individuals as described by the Git transaction log -** -** All source at: https://github.com/surge-synthesizer/surge.git -** -** Surge was a commercial product from 2004-2018, with Copyright and ownership -** in that period held by Claes Johanson at Vember Audio. Claes made Surge -** open source in September 2018. -*/ - -#include - -#include "SurgeSynthProcessor.h" -#include "SurgeSynthEditor.h" -#include "SurgeSynthFlavorExtensions.h" - -void SurgeSynthProcessorSpecificExtensions(SurgeSynthProcessor *p, SurgeSynthesizer *s) {} -void SurgeSynthEditorSpecificExtensions(SurgeSynthEditor *e, SurgeGUIEditor *sed) {} diff --git a/src/surge-xt/plugin_type_extensions/SurgeSynthVSTExtensions.cpp b/src/surge-xt/plugin_type_extensions/SurgeSynthVSTExtensions.cpp deleted file mode 100644 index 7f76b505155..00000000000 --- a/src/surge-xt/plugin_type_extensions/SurgeSynthVSTExtensions.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* -** Surge Synthesizer is Free and Open Source Software -** -** Surge is made available under the Gnu General Public License, v3.0 -** https://www.gnu.org/licenses/gpl-3.0.en.html -** -** Copyright 2004-2020 by various individuals as described by the Git transaction log -** -** All source at: https://github.com/surge-synthesizer/surge.git -** -** Surge was a commercial product from 2004-2018, with Copyright and ownership -** in that period held by Claes Johanson at Vember Audio. Claes made Surge -** open source in September 2018. -*/ - -#include - -#include "SurgeSynthProcessor.h" -#include "SurgeSynthEditor.h" -#include "SurgeSynthFlavorExtensions.h" - -void SurgeSynthProcessorSpecificExtensions(SurgeSynthProcessor *p, SurgeSynthesizer *s) {} -void SurgeSynthEditorSpecificExtensions(SurgeSynthEditor *e, SurgeGUIEditor *sed) {}