zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-04-22 07:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use range with true center point for pan and balance

Browse source 
As specified in MIDI Recommended Practice (RP-036)
This commit is contained in:
Marcus Weseloh 2018-01-03 18:12:47 +01:00 committed by Marcus Weseloh
parent 8f9b89588a
commit ff3e918d47
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/synth/fluid_mod.c
View file

@ -172,7 +172,26 @@ fluid_mod_get_source_value(const unsigned char mod_src,
if (mod_flags & FLUID_MOD_CC)
{
val = fluid_channel_get_cc(chan, mod_src);
/* From MIDI Recommended Practice (RP-036) Default Pan Formula:
* "Since MIDI controller values range from 0 to 127, the exact center
* of the range, 63.5, cannot be represented. Therefore, the effective
* range for CC#10 is modified to be 1 to 127, and values 0 and 1 both
* pan hard left. The recommended method is to subtract 1 from the
* value of CC#10, and saturate the result to be non-negative."
*
* We treat the balance control in exactly the same way, as the same
* problem applies here as well.
*/
if (mod_src == PAN_MSB || mod_src == BALANCE_MSB) {
*range = 126;
val = fluid_channel_get_cc(chan, mod_src) - 1;
if (val < 0) {
val = 0;
}
}
else {
val = fluid_channel_get_cc(chan, mod_src);
}
}
else
{

4
src/utils/fluid_conv.c
View file

@ -292,9 +292,9 @@ fluid_pan(fluid_real_t c, int left)
if (left) {
c = -c;
}
if (c < -500) {
if (c <= -500) {
return (fluid_real_t) 0.0;
} else if (c > 500) {
} else if (c >= 500) {
return (fluid_real_t) 1.0;
} else {
return fluid_pan_tab[(int) (c + 500)];