zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-12-11 21:31:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Nicer error message when user requests LADSPA but is not available.

Browse source
This commit is contained in:
Marcus Weseloh 2017-10-21 22:40:19 +02:00
parent 3cc684e47e
commit 8aa2d14476
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/synth/fluid_synth.c
View file

@ -554,9 +554,7 @@ new_fluid_synth(fluid_settings_t *settings)
fluid_sfloader_t* loader; fluid_sfloader_t* loader;
double gain; double gain;
int i, nbuf; int i, nbuf;
#ifdef LADSPA
int with_ladspa = 0; int with_ladspa = 0;
#endif
/* initialize all the conversion tables and other stuff */ /* initialize all the conversion tables and other stuff */
if (fluid_synth_initialized == 0) if (fluid_synth_initialized == 0)
@ -708,10 +706,10 @@ new_fluid_synth(fluid_settings_t *settings)
fluid_synth_add_default_mod(synth, &default_pitch_bend_mod, FLUID_SYNTH_ADD); fluid_synth_add_default_mod(synth, &default_pitch_bend_mod, FLUID_SYNTH_ADD);
#ifdef LADSPA
/* Create and initialize the Fx unit.*/ /* Create and initialize the Fx unit.*/
fluid_settings_getint(settings, "synth.ladspa.active", &with_ladspa); fluid_settings_getint(settings, "synth.ladspa.active", &with_ladspa);
if (with_ladspa) { if (with_ladspa) {
#ifdef LADSPA
synth->ladspa_fx = new_fluid_ladspa_fx(synth->sample_rate, synth->audio_groups, synth->ladspa_fx = new_fluid_ladspa_fx(synth->sample_rate, synth->audio_groups,
synth->effects_channels, synth->audio_channels); synth->effects_channels, synth->audio_channels);
if(synth->ladspa_fx == NULL) { if(synth->ladspa_fx == NULL) {
@ -719,8 +717,10 @@ new_fluid_synth(fluid_settings_t *settings)
goto error_recovery; goto error_recovery;
} }
fluid_rvoice_mixer_set_ladspa(synth->eventhandler->mixer, synth->ladspa_fx); fluid_rvoice_mixer_set_ladspa(synth->eventhandler->mixer, synth->ladspa_fx);
#else /* LADSPA */
FLUID_LOG(FLUID_WARN, "FluidSynth has not been compiled with LADSPA support");
#endif /* LADSPA */
} }
#endif
/* allocate and add the default sfont loader */ /* allocate and add the default sfont loader */
loader = new_fluid_defsfloader(settings); loader = new_fluid_defsfloader(settings);