cleanup forward declarations

This commit is contained in:
derselbst 2019-10-11 09:59:42 +02:00
parent 928e494c78
commit 819f1ee966
8 changed files with 9 additions and 36 deletions

View file

@ -224,6 +224,7 @@ fluid_inst_zone_t *fluid_inst_zone_next(fluid_inst_zone_t *zone);
int fluid_inst_zone_import_sfont(fluid_inst_zone_t *inst_zone, SFZone *sfzone, fluid_defsfont_t *defsfont);
fluid_sample_t *fluid_inst_zone_get_sample(fluid_inst_zone_t *zone);
int fluid_zone_check_mod(char *zone_name, fluid_mod_t **list_mod, fluid_mod_t **linked_mod);
int fluid_sample_import_sfont(fluid_sample_t *sample, SFSample *sfsample, fluid_defsfont_t *defsfont);
int fluid_sample_in_rom(fluid_sample_t *sample);

View file

@ -44,9 +44,6 @@ static int fluid_voice_calculate_runtime_synthesis_parameters(fluid_voice_t *voi
static int calculate_hold_decay_buffers(fluid_voice_t *voice, int gen_base,
int gen_key2base, int is_decay);
/* outsourced function that to make it unit testable */
fluid_real_t
fluid_voice_get_lower_boundary_for_attenuation(fluid_voice_t *voice);
#define UPDATE_RVOICE0(proc) \
do { \

View file

@ -198,4 +198,9 @@ void fluid_voice_print_mod(fluid_voice_t *voice);
int fluid_voice_get_count_modulators(fluid_voice_t *voice);
fluid_mod_t *fluid_voice_get_modulator(fluid_voice_t *voice, int mod_idx);
/* outsourced function that to make it unit testable */
fluid_real_t fluid_voice_get_lower_boundary_for_attenuation(fluid_voice_t *voice);
void fluid_voice_calculate_modulator_contributions(fluid_voice_t *voice);
#endif /* _FLUID_VOICE_H */

View file

@ -25,10 +25,6 @@
#include "synth/fluid_voice.h"
#include "synth/fluid_chan.h"
//-----------------------------------------------------------------------------
// Externals
void fluid_voice_calculate_modulator_contributions(fluid_voice_t *voice);
//-----------------------------------------------------------------------------
/**
* Compute expected modulation a modulator will supply by

View file

@ -12,19 +12,7 @@ Usage:
#include "fluidsynth.h"
#include "synth/fluid_mod.h"
#include "utils/fluid_sys.h"
//----------------------------------------------------------------------------
/* external functions */
// implemented in fluid_mod.c
// Required: fluid_dump_modulator(), fluid_dump_linked_mod()
// need to add DEBUG preprocessor macro while compiling fluidsynth.
// implemented in fluid_defsfont.c
int fluid_zone_check_mod(char *zone_name, fluid_mod_t **list_mod,
fluid_mod_t **linked_mod);
// implemented in fluid_defsfont.c
void delete_fluid_mod_list(fluid_mod_t *list_mod);
#include "sfloader/fluid_defsfont.h"
//----------------------------------------------------------------------------
static fluid_mod_t * fluid_build_list(fluid_mod_t mod_table[], int count_mod);

View file

@ -19,8 +19,6 @@ Test of value of linked/simple modulator.
#include "synth/fluid_voice.h"
#include "synth/fluid_chan.h"
void fluid_voice_calculate_modulator_contributions(fluid_voice_t *voice);
int float_equal(fluid_real_t x, fluid_real_t y)
{
return ( x == y );

View file

@ -6,14 +6,9 @@ These tests check fluid_mod_check_linked_mod() function.
#include "synth/fluid_mod.h"
#include "utils/fluid_sys.h"
//----------------------------------------------------------------------------
/* external functions */
void delete_fluid_mod_list(fluid_mod_t *list_mod);
//----------------------------------------------------------------------------
static fluid_mod_t * fluid_build_list(fluid_mod_t mod_table[], int count_mod);
int fluid_list_test_identity(fluid_mod_t *list_mod1, fluid_mod_t *list_mod2);
static int fluid_list_test_identity(fluid_mod_t *list_mod1, fluid_mod_t *list_mod2);
// tests the linked "nature" of modulators, i.e. fluid_mod_check_linked_mod()
int main(void)
@ -1405,7 +1400,7 @@ static fluid_mod_t * fluid_build_list(fluid_mod_t mod_table[], int count_mod)
* Both list are identic if that have equal count of modulators and
* respective modulator's structure are fully equal.
*/
int fluid_list_test_identity(fluid_mod_t *list_mod1, fluid_mod_t *list_mod2)
static int fluid_list_test_identity(fluid_mod_t *list_mod1, fluid_mod_t *list_mod2)
{
int count1 = fluid_mod_get_list_count(list_mod1);
int count2 = fluid_mod_get_list_count(list_mod2);

View file

@ -33,13 +33,6 @@
#include "synth/fluid_voice.h"
#include "synth/fluid_chan.h"
//-----------------------------------------------------------------------------
// Externals
void fluid_voice_calculate_modulator_contributions(fluid_voice_t *voice);
fluid_real_t
fluid_voice_get_lower_boundary_for_attenuation(fluid_voice_t *voice);
//-----------------------------------------------------------------------------
/**
* Compute attenuation reduction given by voice modulator(if possible)