From cf5995bf77291e12968b0d55f40a2ac4fffc3f7b Mon Sep 17 00:00:00 2001 From: BlueCyro Date: Mon, 9 Sep 2024 23:37:35 -0500 Subject: [PATCH] chore(soundpipeactions)#: Update action to be more compatible with C# nugets out of the gate --- .github/workflows/build-linux-windows.yml | 17 ++++++++++++++--- modules/zitarev.c | 6 ++++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-linux-windows.yml b/.github/workflows/build-linux-windows.yml index f717b9a..5425a4e 100644 --- a/.github/workflows/build-linux-windows.yml +++ b/.github/workflows/build-linux-windows.yml @@ -4,7 +4,9 @@ on: push: branches: - master - + + workflow_call: + jobs: Build: @@ -29,7 +31,11 @@ jobs: run: bash make_linux_shared.sh - name: Move Linux library to output - run: mv libsoundpipe.so ${{ steps.buildoutput.outputs.build-output-dir }} + run: | + mkdir ${{ steps.buildoutput.outputs.build-output-dir }}/runtimes + mkdir ${{ steps.buildoutput.outputs.build-output-dir }}/runtimes/win-x64 + mkdir ${{ steps.buildoutput.outputs.build-output-dir }}/runtimes/win-x64/native + mv libsoundpipe.so ${{ steps.buildoutput.outputs.build-output-dir }}/runtimes/linux-x64/native - name: Clean up Linux build run: make clean @@ -38,7 +44,12 @@ jobs: run: bash make_windows_shared.sh - name: Move Windows library to output - run: mv libsoundpipe.dll ${{ steps.buildoutput.outputs.build-output-dir }} + + run: | + mkdir ${{ steps.buildoutput.outputs.build-output-dir }}/runtimes + mkdir ${{ steps.buildoutput.outputs.build-output-dir }}/runtimes/linux-x64 + mkdir ${{ steps.buildoutput.outputs.build-output-dir }}/runtimes/linux-x64/native + mv libsoundpipe.dll ${{ steps.buildoutput.outputs.build-output-dir }}/runtimes/linux-x64/native - name: Pack it with a big red ribbon uses: actions/upload-artifact@v4 diff --git a/modules/zitarev.c b/modules/zitarev.c index cd8a9d3..5de2049 100644 --- a/modules/zitarev.c +++ b/modules/zitarev.c @@ -980,7 +980,7 @@ static void computezitarev(zitarev* dsp, int count, FAUSTFLOAT** inputs, FAUSTFL dsp->fRec6[1] = dsp->fRec6[0]; dsp->fRec7[2] = dsp->fRec7[1]; dsp->fRec7[1] = dsp->fRec7[0]; - dsp->fRec8[2] = dsp->fRec8[1]; + dsp->fRec8[2] = dsp->fRec8[1]; dsp->fRec8[1] = dsp->fRec8[0]; dsp->fRec9[2] = dsp->fRec9[1]; dsp->fRec9[1] = dsp->fRec9[0]; @@ -1061,9 +1061,11 @@ int sp_zitarev_compute(sp_data *sp, sp_zitarev *p, SPFLOAT *in1, SPFLOAT *in2, S return SP_OK; } -int sp_zitarev_compute_many(sp_data *sp, sp_zitarev *p, int count, SPFLOAT **stereo_in, SPFLOAT **stereo_out) +int sp_zitarev_compute_many(sp_data *sp, sp_zitarev *p, int count, int mono_input, SPFLOAT **stereo_in, SPFLOAT **stereo_out) { zitarev *dsp = p->faust; + computezitarev(dsp, count, stereo_in, stereo_out); + return SP_OK; }