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

duplicate rvoice_eventhandler in fluid_voice_t

Browse source 
avoiding several indirection to access it
This commit is contained in:
derselbst 2018-04-08 18:35:54 +02:00
parent 7c2e76f2f3
commit ddd14cb00b
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/synth/fluid_synth.c
View file

@ -763,7 +763,7 @@ new_fluid_synth(fluid_settings_t *settings)
goto error_recovery;
}
for (i = 0; i < synth->nvoice; i++) {
synth->voice[i] = new_fluid_voice(synth->sample_rate);
synth->voice[i] = new_fluid_voice(synth->eventhandler, synth->sample_rate);
if (synth->voice[i] == NULL) {
goto error_recovery;
}
@ -2732,7 +2732,7 @@ fluid_synth_update_polyphony_LOCAL(fluid_synth_t* synth, int new_polyphony)
return FLUID_FAILED;
synth->voice = new_voices;
for (i = synth->nvoice; i < new_polyphony; i++) {
synth->voice[i] = new_fluid_voice(synth->sample_rate);
synth->voice[i] = new_fluid_voice(synth->eventhandler, synth->sample_rate);
if (synth->voice[i] == NULL)
return FLUID_FAILED;

19
src/synth/fluid_voice.c
View file

@ -49,21 +49,21 @@ fluid_voice_get_lower_boundary_for_attenuation(fluid_voice_t* voice);
#define UPDATE_RVOICE0(proc) \
do { \
fluid_rvoice_param_t param[EVENT_PARAMS]; \
fluid_rvoice_eventhandler_push_param(voice->channel->synth->eventhandler, proc, voice->rvoice, param); \
fluid_rvoice_eventhandler_push_param(voice->eventhandler, proc, voice->rvoice, param); \
} while (0)
#define UPDATE_RVOICE_GENERIC_R1(proc, obj, rarg) \
do { \
fluid_rvoice_param_t param[EVENT_PARAMS]; \
param[0].real = rarg; \
fluid_rvoice_eventhandler_push_param(voice->channel->synth->eventhandler, proc, obj, param); \
fluid_rvoice_eventhandler_push_param(voice->eventhandler, proc, obj, param); \
} while (0)
#define UPDATE_RVOICE_GENERIC_I1(proc, obj, iarg) \
do { \
fluid_rvoice_param_t param[EVENT_PARAMS]; \
param[0].i = iarg; \
fluid_rvoice_eventhandler_push_param(voice->channel->synth->eventhandler, proc, obj, param); \
fluid_rvoice_eventhandler_push_param(voice->eventhandler, proc, obj, param); \
} while (0)
#define UPDATE_RVOICE_GENERIC_I2(proc, obj, iarg1, iarg2) \
@ -71,7 +71,7 @@ fluid_voice_get_lower_boundary_for_attenuation(fluid_voice_t* voice);
fluid_rvoice_param_t param[EVENT_PARAMS]; \
param[0].i = iarg1; \
param[1].i = iarg2; \
fluid_rvoice_eventhandler_push_param(voice->channel->synth->eventhandler, proc, obj, param); \
fluid_rvoice_eventhandler_push_param(voice->eventhandler, proc, obj, param); \
} while (0)
#define UPDATE_RVOICE_GENERIC_IR(proc, obj, iarg, rarg) \
@ -79,7 +79,7 @@ fluid_voice_get_lower_boundary_for_attenuation(fluid_voice_t* voice);
fluid_rvoice_param_t param[EVENT_PARAMS]; \
param[0].i = iarg; \
param[1].real = rarg; \
fluid_rvoice_eventhandler_push_param(voice->channel->synth->eventhandler, proc, obj, param); \
fluid_rvoice_eventhandler_push_param(voice->eventhandler, proc, obj, param); \
} while (0)
@ -111,7 +111,7 @@ fluid_voice_update_volenv(fluid_voice_t* voice,
if(enqueue)
{
fluid_rvoice_eventhandler_push_param(voice->channel->synth->eventhandler,
fluid_rvoice_eventhandler_push_param(voice->eventhandler,
fluid_adsr_env_set_data,
&voice->rvoice->envlfo.volenv,
param);
@ -143,7 +143,7 @@ fluid_voice_update_modenv(fluid_voice_t* voice,
if(enqueue)
{
fluid_rvoice_eventhandler_push_param(voice->channel->synth->eventhandler,
fluid_rvoice_eventhandler_push_param(voice->eventhandler,
fluid_adsr_env_set_data,
&voice->rvoice->envlfo.modenv,
param);
@ -210,7 +210,7 @@ static void fluid_voice_initialize_rvoice(fluid_voice_t* voice, fluid_real_t out
* new_fluid_voice
*/
fluid_voice_t*
new_fluid_voice(fluid_real_t output_rate)
new_fluid_voice(fluid_rvoice_eventhandler_t* handler, fluid_real_t output_rate)
{
fluid_voice_t* voice;
voice = FLUID_NEW(fluid_voice_t);
@ -231,6 +231,7 @@ new_fluid_voice(fluid_real_t output_rate)
voice->chan = NO_CHANNEL;
voice->key = 0;
voice->vel = 0;
voice->eventhandler = handler;
voice->channel = NULL;
voice->sample = NULL;
voice->output_rate = output_rate;
@ -309,7 +310,7 @@ fluid_voice_init(fluid_voice_t* voice, fluid_sample_t* sample,
unloading of the soundfont while this voice is playing,
once for us and once for the rvoice. */
fluid_sample_incr_ref(sample);
fluid_rvoice_eventhandler_push_ptr(voice->channel->synth->eventhandler, fluid_rvoice_set_sample, voice->rvoice, sample);
fluid_rvoice_eventhandler_push_ptr(voice->eventhandler, fluid_rvoice_set_sample, voice->rvoice, sample);
fluid_sample_incr_ref(sample);
voice->sample = sample;

4
src/synth/fluid_voice.h
View file

@ -29,6 +29,7 @@
#include "fluid_adsr_env.h"
#include "fluid_lfo.h"
#include "fluid_rvoice.h"
#include "fluid_rvoice_event.h"
#include "fluid_sys.h"
#define NO_CHANNEL 0xff
@ -69,6 +70,7 @@ struct _fluid_voice_t
unsigned char key; /* the key of the noteon event, quick access for noteoff */
unsigned char vel; /* the velocity of the noteon event */
fluid_channel_t* channel;
fluid_rvoice_eventhandler_t* eventhandler;
fluid_gen_t gen[GEN_LAST];
fluid_mod_t mod[FLUID_NUM_MOD];
int mod_count;
@ -114,7 +116,7 @@ struct _fluid_voice_t
};
fluid_voice_t* new_fluid_voice(fluid_real_t output_rate);
fluid_voice_t* new_fluid_voice(fluid_rvoice_eventhandler_t* handler, fluid_real_t output_rate);
void delete_fluid_voice(fluid_voice_t* voice);
void fluid_voice_start(fluid_voice_t* voice);