zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-03-02 15:31:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation error if LADSPA is not enabled

Browse source
This commit is contained in:
Marcus Weseloh 2017-10-26 23:46:49 +02:00
parent 633b4f00db
commit b2aed2b317
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/rvoice/fluid_rvoice_mixer.c
View file

@ -201,21 +201,21 @@ fluid_mix_one(fluid_rvoice_t* rvoice, fluid_real_t** bufs, unsigned int bufcount
static FLUID_INLINE int static FLUID_INLINE int
fluid_mixer_buffers_prepare(fluid_mixer_buffers_t* buffers, fluid_real_t** outbufs) fluid_mixer_buffers_prepare(fluid_mixer_buffers_t* buffers, fluid_real_t** outbufs)
{ {
fluid_real_t *reverb_buf = NULL; fluid_real_t *reverb_buf, *chorus_buf;
fluid_real_t *chorus_buf = NULL;
int i; int i;
int with_reverb = buffers->mixer->fx.with_reverb;
int with_chorus = buffers->mixer->fx.with_chorus;
/* Set up the reverb and chorus buffers only when the effect is enabled or /* Set up the reverb and chorus buffers only when the effect is enabled or
* when LADSPA is active. Nonexisting buffers are detected in the DSP loop. * when LADSPA is active. Nonexisting buffers are detected in the DSP loop.
* Not sending the effect signals saves some time in that case. */ * Not sending the effect signals saves some time in that case. */
if (buffers->mixer->fx.with_reverb || buffers->mixer->ladspa_fx != NULL) #ifdef LADSPA
{ int with_ladspa = (buffers->mixer->ladspa_fx != NULL);
reverb_buf = buffers->fx_left_buf[SYNTH_REVERB_CHANNEL]; with_reverb = (with_reverb | with_ladspa);
} with_chorus = (with_chorus | with_ladspa);
if (buffers->mixer->fx.with_chorus || buffers->mixer->ladspa_fx != NULL) #endif
{ reverb_buf = (with_reverb) ? buffers->fx_left_buf[SYNTH_REVERB_CHANNEL] : NULL;
chorus_buf = buffers->fx_left_buf[SYNTH_CHORUS_CHANNEL]; chorus_buf = (with_chorus) ? buffers->fx_left_buf[SYNTH_CHORUS_CHANNEL] : NULL;
}
outbufs[buffers->buf_count*2 + SYNTH_REVERB_CHANNEL] = reverb_buf; outbufs[buffers->buf_count*2 + SYNTH_REVERB_CHANNEL] = reverb_buf;
outbufs[buffers->buf_count*2 + SYNTH_CHORUS_CHANNEL] = chorus_buf; outbufs[buffers->buf_count*2 + SYNTH_CHORUS_CHANNEL] = chorus_buf;