From 304936e61248bdbf458c899e1507102bcc748542 Mon Sep 17 00:00:00 2001 From: Element Green Date: Tue, 22 Jul 2003 14:08:15 +0000 Subject: [PATCH] Some compile time bug fixes. --- fluidsynth/ChangeLog | 8 ++++++++ fluidsynth/src/fluid_midishare.c | 2 ++ fluidsynth/src/fluid_voice.c | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/fluidsynth/ChangeLog b/fluidsynth/ChangeLog index f2b547c1..9ed2779f 100644 --- a/fluidsynth/ChangeLog +++ b/fluidsynth/ChangeLog @@ -1,3 +1,11 @@ +2003-07-22 Josh Green + + * src/fluid_midishare.c: Added include of header "config.h" as + per Albert Graef's request. + * src/fluid_voice.c (fluid_voice_optimize_sample): Moved a + variable declaration to the beginning of function, it was + causing problems with at least one user. + 2003-06-28 Josh Green * src/fluid_defsfont.c: Moved call to fluid_voice_optimize_sample diff --git a/fluidsynth/src/fluid_midishare.c b/fluidsynth/src/fluid_midishare.c index d1a074d2..2346cb6f 100644 --- a/fluidsynth/src/fluid_midishare.c +++ b/fluidsynth/src/fluid_midishare.c @@ -29,6 +29,8 @@ * 03/06/03 : Adapdation for FluidSynth API */ +#include "config.h" + #if MIDISHARE_SUPPORT #include "fluid_midi.h" diff --git a/fluidsynth/src/fluid_voice.c b/fluidsynth/src/fluid_voice.c index a1fa957a..31629329 100644 --- a/fluidsynth/src/fluid_voice.c +++ b/fluidsynth/src/fluid_voice.c @@ -1976,6 +1976,7 @@ int fluid_voice_optimize_sample(fluid_sample_t* s) signed short peak_max = 0; signed short peak_min = 0; signed short peak; + fluid_real_t normalized_amplitude_during_loop; double result; int i; @@ -2012,7 +2013,7 @@ int fluid_voice_optimize_sample(fluid_sample_t* s) */ /* 16 bits => 96+4=100 dB dynamic range => 0.00001 */ - fluid_real_t normalized_amplitude_during_loop=((fluid_real_t)peak)/32768.; + normalized_amplitude_during_loop = ((fluid_real_t)peak)/32768.; result = FLUID_NOISE_FLOOR / normalized_amplitude_during_loop; /* Store in sample */