diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76f7785..4098616 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -465,6 +465,7 @@ jobs: id: slug run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})" - name: Rename macOS bundle + if: steps.cache.outputs.cache-hit == 'true' run: | mv ${{ github.event.repository.name }}-macOS.pkg ${{ github.event.repository.name }}-macOS-intel-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.pkg - uses: actions/upload-artifact@v2 @@ -552,6 +553,7 @@ jobs: id: slug run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})" - name: Rename macOS bundle + if: steps.cache.outputs.cache-hit == 'true' run: | mv ${{ github.event.repository.name }}-macOS.pkg ${{ github.event.repository.name }}-macOS-universal-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.pkg - uses: actions/upload-artifact@v2 diff --git a/plugins/Makefile b/plugins/Makefile index 439d0ff..4e1c83c 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -293,9 +293,9 @@ PLUGIN_FILES += Fundamental/src/dr_wav.c FUNDAMENTAL_CUSTOM = $(DRWAV) # -------------------------------------------------------------- -# ZamAudio (always enabled) +# ZamAudio (always enabled) - TODO -PLUGIN_FILES += $(wildcard ZamAudio/src/*.cpp) +# PLUGIN_FILES += $(wildcard ZamAudio/src/*.cpp) ifneq ($(NOPLUGINS),true) # -------------------------------------------------------------- diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 65aa5f0..dc7220c 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -26,8 +26,8 @@ // Fundamental (always enabled) #include "Fundamental/src/plugin.hpp" -// ZamAudio (always enabled) -#include "ZamAudio/src/plugin.hpp" +// ZamAudio (always enabled) - TODO +// #include "ZamAudio/src/plugin.hpp" #ifndef NOPLUGINS // 21kHz @@ -748,7 +748,7 @@ void saveHighQualityAsDefault(bool) {} // plugin instances Plugin* pluginInstance__Cardinal; Plugin* pluginInstance__Fundamental; -Plugin* pluginInstance__ZamAudio; +// Plugin* pluginInstance__ZamAudio; #ifndef NOPLUGINS Plugin* pluginInstance__21kHz; Plugin* pluginInstance__8Mode; @@ -1023,6 +1023,7 @@ static void initStatic__Fundamental() } } +/* static void initStatic__ZamAudio() { Plugin* const p = new Plugin; @@ -1034,6 +1035,7 @@ static void initStatic__ZamAudio() p->addModel(modelZamComp); } } +*/ #ifndef NOPLUGINS static void initStatic__21kHz() @@ -2844,7 +2846,7 @@ void initStaticPlugins() { initStatic__Cardinal(); initStatic__Fundamental(); - initStatic__ZamAudio(); + // initStatic__ZamAudio(); #ifndef NOPLUGINS initStatic__21kHz(); initStatic__8Mode();