From 52cc645e7e10bc27f6618cba60ca0ff4181321f1 Mon Sep 17 00:00:00 2001 From: Marcus Weseloh Date: Thu, 4 Jan 2018 12:31:22 +0100 Subject: [PATCH] Rename default_balance_mod to custom_balance_mod --- src/synth/fluid_synth.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c index c62210d8..eea6a4e2 100644 --- a/src/synth/fluid_synth.c +++ b/src/synth/fluid_synth.c @@ -138,7 +138,7 @@ static fluid_mod_t default_expr_mod; /* SF2.01 section 8.4.7 */ static fluid_mod_t default_reverb_mod; /* SF2.01 section 8.4.8 */ static fluid_mod_t default_chorus_mod; /* SF2.01 section 8.4.9 */ static fluid_mod_t default_pitch_bend_mod; /* SF2.01 section 8.4.10 */ -static fluid_mod_t default_balance_mod; /* Non-standard modulator */ +static fluid_mod_t custom_balance_mod; /* Non-standard modulator */ /* reverb presets */ static const fluid_revmodel_presets_t revmodel_preset[] = { @@ -412,15 +412,15 @@ fluid_synth_init(void) /* Non-standard MIDI continuous controller 8 to channel stereo balance */ - fluid_mod_set_source1(&default_balance_mod, BALANCE_MSB, /* Index=8 */ + fluid_mod_set_source1(&custom_balance_mod, BALANCE_MSB, /* Index=8 */ FLUID_MOD_CC /* CC=1 */ | FLUID_MOD_LINEAR /* type=0 */ | FLUID_MOD_BIPOLAR /* P=1 */ | FLUID_MOD_POSITIVE /* D=0 */ ); - fluid_mod_set_source2(&default_balance_mod, 0, 0); - fluid_mod_set_dest(&default_balance_mod, GEN_BALANCE); /* Destination: stereo balance */ - fluid_mod_set_amount(&default_balance_mod, 1000.0); /* Amount: 1000 tens of a percent */ + fluid_mod_set_source2(&custom_balance_mod, 0, 0); + fluid_mod_set_dest(&custom_balance_mod, GEN_BALANCE); /* Destination: stereo balance */ + fluid_mod_set_amount(&custom_balance_mod, 1000.0); /* Amount: 1000 tens of a percent */ } static FLUID_INLINE unsigned int fluid_synth_get_ticks(fluid_synth_t* synth) @@ -707,7 +707,7 @@ new_fluid_synth(fluid_settings_t *settings) fluid_synth_add_default_mod(synth, &default_reverb_mod, FLUID_SYNTH_ADD); fluid_synth_add_default_mod(synth, &default_chorus_mod, FLUID_SYNTH_ADD); fluid_synth_add_default_mod(synth, &default_pitch_bend_mod, FLUID_SYNTH_ADD); - fluid_synth_add_default_mod(synth, &default_balance_mod, FLUID_SYNTH_ADD); + fluid_synth_add_default_mod(synth, &custom_balance_mod, FLUID_SYNTH_ADD); /* Create and initialize the Fx unit.*/ fluid_settings_getint(settings, "synth.ladspa.active", &with_ladspa);