diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 9aa5ce8ba..7e6dd5b6b 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,7 @@ +April 30, 2008 +- Fixed: I had instrument vibrato setting the tremolo_sweep_increment value + in the instrument loader, effectively disabling vibrato. + April 29, 2008 - Fixed: FString::StripRight() stripped the final character of the string if there were no designated characters to strip at the end of it. diff --git a/src/timidity/instrum.cpp b/src/timidity/instrum.cpp index bef7957c9..0532bd222 100644 --- a/src/timidity/instrum.cpp +++ b/src/timidity/instrum.cpp @@ -323,7 +323,7 @@ fail: /* vibrato */ if (patch_data.VibratoRate == 0 || patch_data.VibratoDepth == 0) { - sp->tremolo_sweep_increment = 0; + sp->vibrato_sweep_increment = 0; sp->vibrato_control_ratio = 0; sp->vibrato_depth = 0; cmsg(CMSG_INFO, VERB_DEBUG, " * no vibrato\n"); @@ -331,7 +331,7 @@ fail: else { sp->vibrato_control_ratio = convert_vibrato_rate(song, patch_data.VibratoRate); - sp->tremolo_sweep_increment = convert_vibrato_sweep(song, patch_data.VibratoSweep, sp->vibrato_control_ratio); + sp->vibrato_sweep_increment = convert_vibrato_sweep(song, patch_data.VibratoSweep, sp->vibrato_control_ratio); sp->vibrato_depth = patch_data.VibratoDepth; cmsg(CMSG_INFO, VERB_DEBUG, " * vibrato: sweep %d, ctl %d, depth %d\n", sp->vibrato_sweep_increment, sp->vibrato_control_ratio, sp->vibrato_depth);