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

Simple clarification regarding synth->effect_channels and fx_left_buf/fx_right_buf

Browse source
This commit is contained in:
David Henningsson 2009-07-27 10:51:05 +00:00
parent fa4be13951
commit 65f822722e
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
fluidsynth/src/fluid_synth.c
View file

@ -506,7 +506,7 @@ new_fluid_synth(fluid_settings_t *settings)
synth->audio_groups = 128; synth->audio_groups = 128;
} }
if (synth->effects_channels != 2) { if (synth->effects_channels < 2) {
FLUID_LOG(FLUID_WARN, "Invalid number of effects channels (%d)." FLUID_LOG(FLUID_WARN, "Invalid number of effects channels (%d)."
"Setting effects channels to 2.", synth->effects_channels); "Setting effects channels to 2.", synth->effects_channels);
synth->effects_channels = 2; synth->effects_channels = 2;
@ -608,8 +608,8 @@ new_fluid_synth(fluid_settings_t *settings)
goto error_recovery; goto error_recovery;
} }
FLUID_MEMSET(synth->fx_left_buf, 0, 2 * sizeof(fluid_real_t*)); FLUID_MEMSET(synth->fx_left_buf, 0, synth->effects_channels * sizeof(fluid_real_t*));
FLUID_MEMSET(synth->fx_right_buf, 0, 2 * sizeof(fluid_real_t*)); FLUID_MEMSET(synth->fx_right_buf, 0, synth->effects_channels * sizeof(fluid_real_t*));
for (i = 0; i < synth->effects_channels; i++) { for (i = 0; i < synth->effects_channels; i++) {
synth->fx_left_buf[i] = FLUID_ARRAY(fluid_real_t, FLUID_BUFSIZE); synth->fx_left_buf[i] = FLUID_ARRAY(fluid_real_t, FLUID_BUFSIZE);
@ -748,7 +748,7 @@ delete_fluid_synth(fluid_synth_t* synth)
} }
if (synth->fx_left_buf != NULL) { if (synth->fx_left_buf != NULL) {
for (i = 0; i < 2; i++) { for (i = 0; i < synth->effects_channels; i++) {
if (synth->fx_left_buf[i] != NULL) { if (synth->fx_left_buf[i] != NULL) {
FLUID_FREE(synth->fx_left_buf[i]); FLUID_FREE(synth->fx_left_buf[i]);
} }
@ -757,7 +757,7 @@ delete_fluid_synth(fluid_synth_t* synth)
} }
if (synth->fx_right_buf != NULL) { if (synth->fx_right_buf != NULL) {
for (i = 0; i < 2; i++) { for (i = 0; i < synth->effects_channels; i++) {
if (synth->fx_right_buf[i] != NULL) { if (synth->fx_right_buf[i] != NULL) {
FLUID_FREE(synth->fx_right_buf[i]); FLUID_FREE(synth->fx_right_buf[i]);
} }
@ -2031,8 +2031,8 @@ fluid_synth_one_block(fluid_synth_t* synth, int do_not_mix_fx_to_out)
* enabled on synth level. Nonexisting buffers are detected in the * enabled on synth level. Nonexisting buffers are detected in the
* DSP loop. Not sending the reverb / chorus signal saves some time * DSP loop. Not sending the reverb / chorus signal saves some time
* in that case. */ * in that case. */
reverb_buf = synth->with_reverb ? synth->fx_left_buf[0] : NULL; reverb_buf = synth->with_reverb ? synth->fx_left_buf[SYNTH_REVERB_CHANNEL] : NULL;
chorus_buf = synth->with_chorus ? synth->fx_left_buf[1] : NULL; chorus_buf = synth->with_chorus ? synth->fx_left_buf[SYNTH_CHORUS_CHANNEL] : NULL;
fluid_profile(FLUID_PROF_ONE_BLOCK_CLEAR, prof_ref); fluid_profile(FLUID_PROF_ONE_BLOCK_CLEAR, prof_ref);
@ -2079,7 +2079,8 @@ fluid_synth_one_block(fluid_synth_t* synth, int do_not_mix_fx_to_out)
/* send to reverb */ /* send to reverb */
if (reverb_buf) { if (reverb_buf) {
fluid_revmodel_processreplace(synth->reverb, reverb_buf, fluid_revmodel_processreplace(synth->reverb, reverb_buf,
synth->fx_left_buf[0], synth->fx_right_buf[0]); synth->fx_left_buf[SYNTH_REVERB_CHANNEL],
synth->fx_right_buf[SYNTH_REVERB_CHANNEL]);
fluid_check_fpe("Reverb"); fluid_check_fpe("Reverb");
} }
@ -2088,7 +2089,8 @@ fluid_synth_one_block(fluid_synth_t* synth, int do_not_mix_fx_to_out)
/* send to chorus */ /* send to chorus */
if (chorus_buf) { if (chorus_buf) {
fluid_chorus_processreplace(synth->chorus, chorus_buf, fluid_chorus_processreplace(synth->chorus, chorus_buf,
synth->fx_left_buf[1], synth->fx_right_buf[1]); synth->fx_left_buf[SYNTH_CHORUS_CHANNEL],
synth->fx_right_buf[SYNTH_CHORUS_CHANNEL]);
fluid_check_fpe("Chorus"); fluid_check_fpe("Chorus");
} }

4
fluidsynth/src/fluid_synth.h
View file

@ -73,6 +73,8 @@ enum fluid_synth_status
FLUID_SYNTH_STOPPED FLUID_SYNTH_STOPPED
}; };
#define SYNTH_REVERB_CHANNEL 0
#define SYNTH_CHORUS_CHANNEL 1
typedef struct _fluid_bank_offset_t fluid_bank_offset_t; typedef struct _fluid_bank_offset_t fluid_bank_offset_t;
@ -99,7 +101,7 @@ struct _fluid_synth_t
int audio_channels; /** the number of audio channels (1 channel=left+right) */ int audio_channels; /** the number of audio channels (1 channel=left+right) */
int audio_groups; /** the number of (stereo) 'sub'groups from the synth. int audio_groups; /** the number of (stereo) 'sub'groups from the synth.
Typically equal to audio_channels. */ Typically equal to audio_channels. */
int effects_channels; /** the number of effects channels (= 2) */ int effects_channels; /** the number of effects channels (>= 2) */
unsigned int state; /** the synthesizer state */ unsigned int state; /** the synthesizer state */
unsigned int ticks; /** the number of audio samples since the start */ unsigned int ticks; /** the number of audio samples since the start */
unsigned int start; /** the start in msec, as returned by system clock */ unsigned int start; /** the start in msec, as returned by system clock */