From 8ec580f259814942da7e8da82cbf136c6fca41a5 Mon Sep 17 00:00:00 2001 From: derselbst Date: Fri, 9 Mar 2018 20:28:40 +0100 Subject: [PATCH] remove unused fluid_voice_t::volenv --- src/synth/fluid_voice.c | 11 ----------- src/synth/fluid_voice.h | 3 --- 2 files changed, 14 deletions(-) diff --git a/src/synth/fluid_voice.c b/src/synth/fluid_voice.c index c1f9bfd7..1129c68a 100644 --- a/src/synth/fluid_voice.c +++ b/src/synth/fluid_voice.c @@ -90,15 +90,6 @@ fluid_voice_get_lower_boundary_for_attenuation(fluid_voice_t* voice); } while (0) -#define UPDATE_RVOICE_VOLENV(section, arg1, arg2, arg3, arg4, arg5) \ - do { \ - fluid_adsr_env_set_data(&voice->volenv, section, arg1, arg2, arg3, arg4, arg5) \ - UPDATE_RVOICE_GENERIC_ALL(fluid_adsr_env_set_data, &voice->rvoice->envlfo.volenv, section, arg1, arg2, arg3, arg4, arg5) \ - } while(0) - -#define UPDATE_RVOICE_MODENV(section, arg1, arg2, arg3, arg4, arg5) \ - UPDATE_RVOICE_GENERIC_ALL(fluid_adsr_env_set_data, &voice->rvoice->envlfo.modenv, section, arg1, arg2, arg3, arg4, arg5) - #define UPDATE_RVOICE_R1(proc, arg1) UPDATE_RVOICE_GENERIC_R1(proc, voice->rvoice, arg1) #define UPDATE_RVOICE_I1(proc, arg1) UPDATE_RVOICE_GENERIC_I1(proc, voice->rvoice, arg1) #define UPDATE_RVOICE_FILTER1(proc, arg1) UPDATE_RVOICE_GENERIC_R1(proc, &voice->rvoice->resonant_filter, arg1) @@ -119,8 +110,6 @@ fluid_voice_update_volenv(fluid_voice_t* voice, fluid_real_t min, fluid_real_t max) { - fluid_adsr_env_set_data(&voice->volenv, section, count, coeff, increment, - min, max); UPDATE_RVOICE_GENERIC_ALL(fluid_adsr_env_set_data, &voice->rvoice->envlfo.volenv, section, count, coeff, increment, min, max); diff --git a/src/synth/fluid_voice.h b/src/synth/fluid_voice.h index 6776fa44..67780ace 100644 --- a/src/synth/fluid_voice.h +++ b/src/synth/fluid_voice.h @@ -79,7 +79,6 @@ struct _fluid_voice_t fluid_real_t output_rate; /* the sample rate of the synthesizer (dupe in rvoice) */ unsigned int start_time; - fluid_adsr_env_t volenv; /* Volume envelope (dupe in rvoice) */ /* basic parameters */ fluid_real_t pitch; /* the pitch in midicents (dupe in rvoice) */ @@ -195,7 +194,5 @@ fluid_voice_unlock_rvoice(fluid_voice_t* voice) fluid_real_t fluid_voice_gen_value(const fluid_voice_t* voice, int num); void fluid_voice_set_custom_filter(fluid_voice_t* voice, enum fluid_iir_filter_type type, enum fluid_iir_filter_flags flags); -#define fluid_voice_get_loudness(voice) (fluid_adsr_env_get_max_val(&voice->volenv)) - #endif /* _FLUID_VOICE_H */