brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not use zamaudio modules for now, wait until 22.10

Browse source
This commit is contained in:
falkTX 2022-09-09 13:49:02 +01:00
parent ba760be01d
commit 68e810c8f4
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -465,6 +465,7 @@ jobs:
id: slug id: slug
run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})" run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})"
- name: Rename macOS bundle - name: Rename macOS bundle
if: steps.cache.outputs.cache-hit == 'true'
run: | run: |
mv ${{ github.event.repository.name }}-macOS.pkg ${{ github.event.repository.name }}-macOS-intel-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.pkg 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 - uses: actions/upload-artifact@v2
@ -552,6 +553,7 @@ jobs:
id: slug id: slug
run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})" run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})"
- name: Rename macOS bundle - name: Rename macOS bundle
if: steps.cache.outputs.cache-hit == 'true'
run: | run: |
mv ${{ github.event.repository.name }}-macOS.pkg ${{ github.event.repository.name }}-macOS-universal-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.pkg 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 - uses: actions/upload-artifact@v2

4
plugins/Makefile
View file

@ -293,9 +293,9 @@ PLUGIN_FILES += Fundamental/src/dr_wav.c
FUNDAMENTAL_CUSTOM = $(DRWAV) 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) ifneq ($(NOPLUGINS),true)
# -------------------------------------------------------------- # --------------------------------------------------------------

10
plugins/plugins.cpp
View file

@ -26,8 +26,8 @@
// Fundamental (always enabled) // Fundamental (always enabled)
#include "Fundamental/src/plugin.hpp" #include "Fundamental/src/plugin.hpp"
// ZamAudio (always enabled) // ZamAudio (always enabled) - TODO
#include "ZamAudio/src/plugin.hpp" // #include "ZamAudio/src/plugin.hpp"
#ifndef NOPLUGINS #ifndef NOPLUGINS
// 21kHz // 21kHz
@ -748,7 +748,7 @@ void saveHighQualityAsDefault(bool) {}
// plugin instances // plugin instances
Plugin* pluginInstance__Cardinal; Plugin* pluginInstance__Cardinal;
Plugin* pluginInstance__Fundamental; Plugin* pluginInstance__Fundamental;
Plugin* pluginInstance__ZamAudio; // Plugin* pluginInstance__ZamAudio;
#ifndef NOPLUGINS #ifndef NOPLUGINS
Plugin* pluginInstance__21kHz; Plugin* pluginInstance__21kHz;
Plugin* pluginInstance__8Mode; Plugin* pluginInstance__8Mode;
@ -1023,6 +1023,7 @@ static void initStatic__Fundamental()
} }
} }
/*
static void initStatic__ZamAudio() static void initStatic__ZamAudio()
{ {
Plugin* const p = new Plugin; Plugin* const p = new Plugin;
@ -1034,6 +1035,7 @@ static void initStatic__ZamAudio()
p->addModel(modelZamComp); p->addModel(modelZamComp);
} }
} }
*/
#ifndef NOPLUGINS #ifndef NOPLUGINS
static void initStatic__21kHz() static void initStatic__21kHz()
@ -2844,7 +2846,7 @@ void initStaticPlugins()
{ {
initStatic__Cardinal(); initStatic__Cardinal();
initStatic__Fundamental(); initStatic__Fundamental();
initStatic__ZamAudio(); // initStatic__ZamAudio();
#ifndef NOPLUGINS #ifndef NOPLUGINS
initStatic__21kHz(); initStatic__21kHz();
initStatic__8Mode(); initStatic__8Mode();