zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-12-04 10:01:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove LADSPA deactivation hooks from FluidSynth again

Browse source
This commit is contained in:
Marcus Weseloh 2017-10-21 15:01:02 +02:00
parent 128a669ef8
commit d6066d0560
5 changed files with 0 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/rvoice/fluid_rvoice_event.c
View file

@ -121,10 +121,6 @@ fluid_rvoice_event_dispatch(fluid_rvoice_event_t* event)
EVENTFUNC_ALL(fluid_rvoice_mixer_set_chorus_params, fluid_rvoice_mixer_t*); EVENTFUNC_ALL(fluid_rvoice_mixer_set_chorus_params, fluid_rvoice_mixer_t*);
EVENTFUNC_R4(fluid_rvoice_mixer_set_reverb_params, fluid_rvoice_mixer_t*); EVENTFUNC_R4(fluid_rvoice_mixer_set_reverb_params, fluid_rvoice_mixer_t*);
#ifdef LADSPA
EVENTFUNC_0(fluid_rvoice_mixer_deactivate_ladspa, fluid_rvoice_mixer_t*);
#endif
FLUID_LOG(FLUID_ERR, "fluid_rvoice_event_dispatch: Unknown method %p to dispatch!", event->method); FLUID_LOG(FLUID_ERR, "fluid_rvoice_event_dispatch: Unknown method %p to dispatch!", event->method);
} }

11
src/rvoice/fluid_rvoice_mixer.c
View file

@ -646,17 +646,6 @@ void fluid_rvoice_mixer_set_ladspa(fluid_rvoice_mixer_t* mixer, fluid_ladspa_fx_
{ {
mixer->ladspa_fx = ladspa_fx; mixer->ladspa_fx = ladspa_fx;
} }
void fluid_rvoice_mixer_deactivate_ladspa(fluid_rvoice_mixer_t *mixer)
{
if (mixer->ladspa_fx == NULL) return;
mixer->ladspa_fx->state = FLUID_LADSPA_INACTIVE;
/* Signal LADSPA engine that deactivation has been processed */
fluid_cond_mutex_lock(mixer->ladspa_fx->state_mutex);
fluid_cond_broadcast(mixer->ladspa_fx->state_cond);
fluid_cond_mutex_unlock(mixer->ladspa_fx->state_mutex);
}
#endif #endif
void fluid_rvoice_mixer_set_reverb_enabled(fluid_rvoice_mixer_t* mixer, int on) void fluid_rvoice_mixer_set_reverb_enabled(fluid_rvoice_mixer_t* mixer, int on)

1
src/rvoice/fluid_rvoice_mixer.h
View file

@ -70,7 +70,6 @@ void fluid_rvoice_mixer_set_threads(fluid_rvoice_mixer_t* mixer, int thread_coun
#ifdef LADSPA #ifdef LADSPA
void fluid_rvoice_mixer_set_ladspa(fluid_rvoice_mixer_t* mixer, fluid_ladspa_fx_t* ladspa_fx); void fluid_rvoice_mixer_set_ladspa(fluid_rvoice_mixer_t* mixer, fluid_ladspa_fx_t* ladspa_fx);
void fluid_rvoice_mixer_deactivate_ladspa(fluid_rvoice_mixer_t *mixer);
#endif #endif
#endif #endif

32
src/synth/fluid_synth.c
View file

@ -2383,16 +2383,6 @@ fluid_synth_set_sample_rate(fluid_synth_t* synth, float sample_rate)
fluid_synth_update_mixer(synth, fluid_rvoice_mixer_set_samplerate, fluid_synth_update_mixer(synth, fluid_rvoice_mixer_set_samplerate,
0, sample_rate); 0, sample_rate);
fluid_synth_api_exit(synth); fluid_synth_api_exit(synth);
#ifdef LADSPA
/* Signal sample rate change to LADSPA effects. Called after releasing the
* synth api, as LADSPA might need to wait for rvoice mixer to deactivate
* the effects unit first. */
if (synth->ladspa_fx != NULL)
{
fluid_ladspa_set_sample_rate(synth->ladspa_fx, synth);
}
#endif
} }
@ -5279,25 +5269,3 @@ int fluid_synth_set_channel_type(fluid_synth_t* synth, int chan, int type)
FLUID_API_RETURN(FLUID_OK); FLUID_API_RETURN(FLUID_OK);
} }
#ifdef LADSPA
/**
* Deactivate the LADSPA effects
*
* @param synth FluidSynth instance
* @return FLUID_OK on success, FLUID_FAILED otherwise
*/
int fluid_synth_deactivate_ladspa(fluid_synth_t *synth)
{
int ret;
fluid_return_val_if_fail (synth != NULL, FLUID_FAILED);
fluid_synth_api_enter(synth);
ret = fluid_rvoice_eventhandler_push(synth->eventhandler,
fluid_rvoice_mixer_deactivate_ladspa,
synth->eventhandler->mixer, 0, 0.0f);
FLUID_API_RETURN(ret);
}
#endif /* LADSPA */

4
src/synth/fluid_synth.h
View file

@ -199,10 +199,6 @@ int fluid_synth_reset_chorus(fluid_synth_t* synth);
int fluid_synth_set_chorus_full(fluid_synth_t* synth, int set, int nr, double level, int fluid_synth_set_chorus_full(fluid_synth_t* synth, int set, int nr, double level,
double speed, double depth_ms, int type); double speed, double depth_ms, int type);
#ifdef LADSPA
int fluid_synth_deactivate_ladspa(fluid_synth_t *synth);
#endif
fluid_sample_timer_t* new_fluid_sample_timer(fluid_synth_t* synth, fluid_timer_callback_t callback, void* data); fluid_sample_timer_t* new_fluid_sample_timer(fluid_synth_t* synth, fluid_timer_callback_t callback, void* data);
int delete_fluid_sample_timer(fluid_synth_t* synth, fluid_sample_timer_t* timer); int delete_fluid_sample_timer(fluid_synth_t* synth, fluid_sample_timer_t* timer);