zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-30 16:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove unused fluid_voice_t::volenv

Browse source
This commit is contained in:
derselbst 2018-03-09 20:28:40 +01:00
parent a58bad1ae4
commit 8ec580f259
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/synth/fluid_voice.c
View file

@ -90,15 +90,6 @@ fluid_voice_get_lower_boundary_for_attenuation(fluid_voice_t* voice);
} while (0) } 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_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_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) #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 min,
fluid_real_t max) 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, UPDATE_RVOICE_GENERIC_ALL(fluid_adsr_env_set_data,
&voice->rvoice->envlfo.volenv, section, count, &voice->rvoice->envlfo.volenv, section, count,
coeff, increment, min, max); coeff, increment, min, max);

3
src/synth/fluid_voice.h
View file

@ -79,7 +79,6 @@ struct _fluid_voice_t
fluid_real_t output_rate; /* the sample rate of the synthesizer (dupe in rvoice) */ fluid_real_t output_rate; /* the sample rate of the synthesizer (dupe in rvoice) */
unsigned int start_time; unsigned int start_time;
fluid_adsr_env_t volenv; /* Volume envelope (dupe in rvoice) */
/* basic parameters */ /* basic parameters */
fluid_real_t pitch; /* the pitch in midicents (dupe in rvoice) */ 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); 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); 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 */ #endif /* _FLUID_VOICE_H */