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

Cosmetic changes

Browse source
This commit is contained in:
derselbst 2022-03-05 18:18:28 +01:00
parent 22144a4fa3
commit 122066ca6d
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/rvoice/fluid_adsr_env.h
View file

@ -37,7 +37,7 @@ struct _fluid_env_data_t
};
/* Indices for envelope tables */
enum fluid_voice_envelope_index_t
enum fluid_voice_envelope_index
{
FLUID_VOICE_ENVDELAY,
FLUID_VOICE_ENVATTACK,
@ -49,7 +49,7 @@ enum fluid_voice_envelope_index_t
FLUID_VOICE_ENVLAST
};
typedef enum fluid_voice_envelope_index_t fluid_adsr_env_section_t;
typedef enum fluid_voice_envelope_index fluid_adsr_env_section_t;
typedef struct _fluid_adsr_env_t fluid_adsr_env_t;
@ -57,8 +57,8 @@ struct _fluid_adsr_env_t
{
fluid_env_data_t data[FLUID_VOICE_ENVLAST];
unsigned int count;
int section;
fluid_real_t val; /* the current value of the envelope */
fluid_adsr_env_section_t section;
};
/* For performance, all functions are inlined */
@ -106,8 +106,6 @@ fluid_adsr_env_calc(fluid_adsr_env_t *env, int is_volenv)
}
env->val = x;
}
/* This one cannot be inlined since it is referenced in
@ -118,7 +116,7 @@ static FLUID_INLINE void
fluid_adsr_env_reset(fluid_adsr_env_t *env)
{
env->count = 0;
env->section = 0;
env->section = FLUID_VOICE_ENVDELAY;
env->val = 0.0f;
}

3
src/synth/fluid_voice.c
View file

@ -1110,8 +1110,9 @@ fluid_voice_update_param(fluid_voice_t *voice, int gen)
/* Modulation envelope */
case GEN_MODENVDELAY: /* SF2.01 section 8.1.3 # 25 */
fluid_clip(x, -12000.0f, 5000.0f);
count = NUM_BUFFERS_DELAY(x);
fluid_voice_update_modenv(voice, TRUE, FLUID_VOICE_ENVDELAY,
NUM_BUFFERS_DELAY(x), 0.0f, 0.0f, -1.0f, 1.0f);
count, 0.0f, 0.0f, -1.0f, 1.0f);
break;
case GEN_MODENVATTACK: /* SF2.01 section 8.1.3 # 26 */