zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-03-02 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use absolute centibels for range of balance generator

Browse source
This commit is contained in:
Marcus Weseloh 2018-01-04 15:27:57 +01:00
parent 52cc645e7e
commit 2e4a517a3f
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/synth/fluid_gen.c
View file

@ -86,7 +86,7 @@ static const fluid_gen_info_t fluid_gen_info[] = {
{ GEN_EXCLUSIVECLASS, 0, 0, 0.0f, 0.0f, 0.0f }, { GEN_EXCLUSIVECLASS, 0, 0, 0.0f, 0.0f, 0.0f },
{ GEN_OVERRIDEROOTKEY, 1, 0, 0.0f, 127.0f, -1.0f }, { GEN_OVERRIDEROOTKEY, 1, 0, 0.0f, 127.0f, -1.0f },
{ GEN_PITCH, 1, 0, 0.0f, 127.0f, 0.0f }, { GEN_PITCH, 1, 0, 0.0f, 127.0f, 0.0f },
{ GEN_BALANCE, 1, 0, -1000.0f, 1000.0f, 0.0f } { GEN_BALANCE, 1, 0, -960.0f, 960.0f, 0.0f }
}; };

5
src/synth/fluid_synth.c
View file

@ -414,13 +414,14 @@ fluid_synth_init(void)
/* Non-standard MIDI continuous controller 8 to channel stereo balance */ /* Non-standard MIDI continuous controller 8 to channel stereo balance */
fluid_mod_set_source1(&custom_balance_mod, BALANCE_MSB, /* Index=8 */ fluid_mod_set_source1(&custom_balance_mod, BALANCE_MSB, /* Index=8 */
FLUID_MOD_CC /* CC=1 */ FLUID_MOD_CC /* CC=1 */
| FLUID_MOD_LINEAR /* type=0 */ | FLUID_MOD_CONCAVE /* type=1 */
| FLUID_MOD_BIPOLAR /* P=1 */ | FLUID_MOD_BIPOLAR /* P=1 */
| FLUID_MOD_POSITIVE /* D=0 */ | FLUID_MOD_POSITIVE /* D=0 */
); );
fluid_mod_set_source2(&custom_balance_mod, 0, 0); fluid_mod_set_source2(&custom_balance_mod, 0, 0);
fluid_mod_set_dest(&custom_balance_mod, GEN_BALANCE); /* Destination: stereo balance */ 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 */ /* Amount: 96 dB of attenuation (on the opposite channel) */
fluid_mod_set_amount(&custom_balance_mod, 960.0);
} }
static FLUID_INLINE unsigned int fluid_synth_get_ticks(fluid_synth_t* synth) static FLUID_INLINE unsigned int fluid_synth_get_ticks(fluid_synth_t* synth)

9
src/utils/fluid_conv.c
View file

@ -307,7 +307,7 @@ fluid_pan(fluid_real_t c, int left)
* channel is attenuated. If balance is positive, only the left channel is * channel is attenuated. If balance is positive, only the left channel is
* attenuated. * attenuated.
* *
* @params balance left/right balance, range [-1000;1000] in tens of percent * @params balance left/right balance, range [-960;960] in absolute centibels
* @return amount of attenuation [0.0;1.0] * @return amount of attenuation [0.0;1.0]
*/ */
fluid_real_t fluid_balance(fluid_real_t balance, int left) fluid_real_t fluid_balance(fluid_real_t balance, int left)
@ -328,12 +328,7 @@ fluid_real_t fluid_balance(fluid_real_t balance, int left)
balance = -balance; balance = -balance;
} }
if (balance >= 1000) return fluid_cb2amp(balance);
{
return 0.0f;
}
return 1.0f - balance * 0.001f;
} }
/* /*