diff options
author | Robin Gareus <robin@gareus.org> | 2019-09-04 04:22:24 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2019-09-04 04:35:59 +0200 |
commit | fdcddc736b8e3fec528b7414b6a2259bc880e4cf (patch) | |
tree | 506d9bc211a054cb12fb7fac0ab9d19052e3486e /libs/fluidsynth/src/fluid_mod.c | |
parent | 69a3b0b46eb17638c5881d6edba2bb00c813a851 (diff) |
Update Fluidsynth to v2.0.6-git
Diffstat (limited to 'libs/fluidsynth/src/fluid_mod.c')
-rw-r--r-- | libs/fluidsynth/src/fluid_mod.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/fluidsynth/src/fluid_mod.c b/libs/fluidsynth/src/fluid_mod.c index 5e57455d4d..57313caf42 100644 --- a/libs/fluidsynth/src/fluid_mod.c +++ b/libs/fluidsynth/src/fluid_mod.c @@ -334,21 +334,21 @@ fluid_mod_transform_source_value(fluid_real_t val, unsigned char mod_flags, cons * is close enough. */ case FLUID_MOD_SIN | FLUID_MOD_UNIPOLAR | FLUID_MOD_POSITIVE: /* custom sin(x) */ - val = sin(M_PI / 2 * val_norm * 0.87); + val = FLUID_SIN((FLUID_M_PI / 2.0f * 0.87f) * val_norm); break; case FLUID_MOD_SIN | FLUID_MOD_UNIPOLAR | FLUID_MOD_NEGATIVE: /* custom */ - val = sin(M_PI / 2 * (1.0f - val_norm) * 0.87); + val = FLUID_SIN((FLUID_M_PI / 2.0f * 0.87f) * (1.0f - val_norm)); break; case FLUID_MOD_SIN | FLUID_MOD_BIPOLAR | FLUID_MOD_POSITIVE: /* custom */ - val = (val_norm > 0.5f) ? sin(M_PI / 2 * 2 * (val_norm - 0.5f)) - : -sin(M_PI / 2 * 2 * (0.5f - val_norm)); + val = (val_norm > 0.5f) ? FLUID_SIN(FLUID_M_PI * (val_norm - 0.5f)) + : -FLUID_SIN(FLUID_M_PI * (0.5f - val_norm)); break; case FLUID_MOD_SIN | FLUID_MOD_BIPOLAR | FLUID_MOD_NEGATIVE: /* custom */ - val = (val_norm > 0.5f) ? -sin(M_PI / 2 * 2 * (val_norm - 0.5f)) - : sin(M_PI / 2 * 2 * (0.5f - val_norm)); + val = (val_norm > 0.5f) ? -FLUID_SIN(FLUID_M_PI * (val_norm - 0.5f)) + : FLUID_SIN(FLUID_M_PI * (0.5f - val_norm)); break; default: @@ -605,11 +605,11 @@ fluid_mod_check_cc_source(const fluid_mod_t *mod, unsigned char src1_select) */ int fluid_mod_check_sources(const fluid_mod_t *mod, const char *name) { - static const char *invalid_non_cc_src = + static const char invalid_non_cc_src[] = "Invalid modulator, using non-CC source %s.src%d=%d"; - static const char *invalid_cc_src = + static const char invalid_cc_src[] = "Invalid modulator, using CC source %s.src%d=%d"; - static const char *src1_is_none = + static const char src1_is_none[] = "Modulator with source 1 none %s.src1=%d"; /* checks valid non cc sources */ |