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

Move fluid_synth_get_ladspa_fx to synth, typedef to types.

Browse source
This commit is contained in:
Marcus Weseloh 2017-11-19 14:29:32 +01:00
parent e511992680
commit 79c32301f2
7 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/fluidsynth/ladspa.h
View file

@ -25,10 +25,6 @@
extern "C" {
#endif
typedef struct _fluid_ladspa_fx_t fluid_ladspa_fx_t;
FLUIDSYNTH_API fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth);
FLUIDSYNTH_API int fluid_ladspa_is_active(fluid_ladspa_fx_t *fx);
FLUIDSYNTH_API int fluid_ladspa_activate(fluid_ladspa_fx_t *fx);
FLUIDSYNTH_API int fluid_ladspa_deactivate(fluid_ladspa_fx_t *fx);

4
include/fluidsynth/synth.h
View file

@ -347,6 +347,10 @@ FLUIDSYNTH_API
FLUID_DEPRECATED
void fluid_synth_set_midi_router(fluid_synth_t* synth, fluid_midi_router_t* router);
/* LADSPA */
FLUIDSYNTH_API fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth);
#ifdef __cplusplus
}
#endif

2
include/fluidsynth/types.h
View file

@ -57,6 +57,8 @@ typedef struct _fluid_sequencer_t fluid_sequencer_t; /**< Sequencer i
typedef struct _fluid_ramsfont_t fluid_ramsfont_t; /**< RAM SoundFont */
typedef struct _fluid_rampreset_t fluid_rampreset_t; /**< RAM SoundFont preset */
typedef struct _fluid_cmd_handler_t fluid_cmd_handler_t; /**< Shell Command Handler */
typedef struct _fluid_ladspa_fx_t fluid_ladspa_fx_t; /**< LADSPA effects instance */
typedef int fluid_istream_t; /**< Input stream descriptor */
typedef int fluid_ostream_t; /**< Output stream descriptor */

16
src/bindings/fluid_ladspa.c
View file

@ -262,17 +262,6 @@ void delete_fluid_ladspa_fx(fluid_ladspa_fx_t *fx)
FLUID_FREE(fx);
}
/**
* Return the LADSPA effects instance used by FluidSynth
*
* @param synth FluidSynth instance
* @return pointer to LADSPA fx or NULL
*/
fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth)
{
return synth->ladspa_fx;
}
/**
* Add host buffers to the LADSPA engine.
*
@ -1674,11 +1663,6 @@ static FLUID_INLINE void copy_effect_to_host_buffers(fluid_ladspa_fx_t *fx, int
/* Dummy functions to use if LADSPA is not compiled in, to keep the
* FluidSynth library ABI stable */
fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth)
{
return NULL;
}
int fluid_ladspa_is_active(fluid_ladspa_fx_t *fx)
{
return FALSE;

1
src/bindings/fluid_ladspa.h
View file

@ -29,7 +29,6 @@
fluid_ladspa_fx_t *new_fluid_ladspa_fx(fluid_real_t sample_rate, int buffer_size);
void delete_fluid_ladspa_fx(fluid_ladspa_fx_t *fx);
fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth);
int fluid_ladspa_set_sample_rate(fluid_ladspa_fx_t *fx, fluid_real_t sample_rate);

11
src/synth/fluid_synth.c
View file

@ -5288,3 +5288,14 @@ int fluid_synth_set_channel_type(fluid_synth_t* synth, int chan, int type)
FLUID_API_RETURN(FLUID_OK);
}
/**
* Return the LADSPA effects instance used by FluidSynth
*
* @param synth FluidSynth instance
* @return pointer to LADSPA fx or NULL
*/
fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth)
{
return synth->ladspa_fx;
}

6
src/synth/fluid_synth.h
View file

@ -169,9 +169,7 @@ struct _fluid_synth_t
fluid_mod_t* default_mod; /**< the (dynamic) list of default modulators */
#ifdef LADSPA
fluid_ladspa_fx_t* ladspa_fx; /**< Effects unit for LADSPA support */
#endif
fluid_ladspa_fx_t* ladspa_fx; /**< Effects unit for LADSPA support */
};
fluid_preset_t* fluid_synth_find_preset(fluid_synth_t* synth,
@ -213,4 +211,6 @@ void fluid_synth_process_event_queue(fluid_synth_t* synth);
void fluid_synth_settings(fluid_settings_t* settings);
fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth);
#endif /* _FLUID_SYNTH_H */